edited person model
Merge branches 'master' and 'ben'

Conflicts:
	hackathon/stepup/models.py
Merge branch 'master' of https://github.com/jrouly/srct-vahack