Fixed angular intergration
Merge remote-tracking branch 'origin/master' into angular-injection

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
Working angular
Added bootstrap
Merge branch 'angular-injection'