4 commits

Author	SHA1	Message	Date
Luke Pulverenti	ce8bc1a2f6	update action sheet	2016-01-31 19:59:43 -05:00
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	e17ea4ac1e	restore people fields	2015-08-21 11:34:42 -04:00
Luke Pulverenti	aa454b2f24	add slideshows to now playing page	2015-08-21 01:00:56 -04:00