detail view, fix server
Merge branch 'master' of https://github.com/mikehcheng/HackTech

Conflicts:
	caleats/models.pyc