Single Page Views Updated
Merge branch 'master' of https://github.com/giorgiovinci/amshackathon

Conflicts:
	backend/ams/views.py
	backend/ams/views.pyc
	frontend/data.json