Added forms and small fix to model
Merge branch 'master' of https://github.com/kayethano/kickpassion

Conflicts:
	kickpassion/engine/models.py