Use vagrant-proxyconf, if available
Add Angular translation setup
Merge branch 'feature/angular-i8ln' into develop

Conflicts:
	js/angular/app/scripts/app.js
	js/angular/app/scripts/modules/indicators/map-controller.js
	js/angular/app/scripts/modules/map/map-partial.html