added loading directive
Merge branch 'master' into signup-feature

Conflicts:
	app/views/partials/signup.html
finished signup feature
Merge branch 'signup-feature'