4 commits

Author	SHA1	Message	Date
Luke Pulverenti	fcdd2e4f4b	update web components	2015-12-23 12:46:01 -05:00
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	cc428aac1d	update search	2015-09-23 22:31:40 -04:00
Luke Pulverenti	2548f83871	rework settings page	2015-07-28 15:42:24 -04:00