3 commits

Author	SHA1	Message	Date
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	cbb6337b41	update polymer	2015-10-07 21:49:40 -04:00
Luke Pulverenti	9b20e2c860	update translations	2015-07-27 15:55:31 -04:00