- detail view changes
Merge branch 'master' of https://github.com/edxe/socia_aee

Conflicts:
	app/views/main.html