Merge branch 'master' of https://github.com/mframp/Animation-Project-Manager

Conflicts:
	app.js
	views/angular/app.js