All files needed for AngularJS route and bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web_CA/.idea/workspace.xml