-
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-app/js/angular.min.js