Merge pull request #1 from benkyet/master

wrong flow
oo
Merge branch 'master' of github.com:Jamiltz/website

Conflicts:
	dev/src/app/account/account.js
	dev/src/app/app.js
	dev/src/app/signup/signup.js
fix templateUrl
Merge pull request #7 from Jamiltz/fix/templateUrl

Fix/template url