Merge remote-tracking branch 'master_repo/master'
removal of cruft
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	dj_eden_app/views.py