small fixes
Merge branch 'master' of https://github.com/Vagdish/PyPass.git

Conflicts:
	models.py