update
Merge branch 'master' of https://github.com/aokholm/mpcd_web

Conflicts:
	analyze/views.py