working
Merge branch 'master' of https://github.com/JohnyMoSwag/IGF

Conflicts:
	appname/__init__.py
	appname/controllers/main.py
	appname/forms.py
	appname/models.py
	appname/templates/base.html
	appname/templates/login.html
	appname/templates/unlock.html