Bug fixes
Merge branch 'master' of https://github.com/isurfbecause/fitstrong

Conflicts:
	client/views/welcome/welcome.js