Refactored name
Merge branch 'master' of https://github.com/Falkirks/TeamShog

Conflicts:
	tpl/login.html