Added AngularJS
Merge origin/master

Conflicts:
	app/Resources/assets/js/app/app.js
	app/Resources/views/base.html.twig