mergee
Merge branch 'master' of https://github.com/nkp/hackkings

Conflicts:
	models/project.py
Merge branch 'master' of https://github.com/nkp/hackkings