fixing build issues.
Merge branch 'master' of https://github.com/Arknium/clubmanager

Conflicts:
	src/app/login/login.js