Alterations
Merge branch 'master' of https://github.com/employ/core

Conflicts:
	.DS_Store
	app/static/js/.DS_Store
	app/users/forms.py