4 commits

Author	SHA1	Message	Date
Luke Pulverenti	d33230d361	fix merge conflicts	2016-01-19 14:49:42 -05:00
Luke Pulverenti	bcfee41a57	merge from dev	2016-01-14 12:04:42 -05:00
Luke Pulverenti	fcdd2e4f4b	update web components	2015-12-23 12:46:01 -05:00
Luke Pulverenti	f36e664503	get api libs from bower	2015-12-16 00:30:14 -05:00