app.* files
app.* files

Merge branch 'master' of https://github.com/failwin/angular-spa

Conflicts:
	app/js/app.js