Merge branch 'master' of C:\Users\user\WebstormProjects\2014.09.02.gntel.threshold with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/compRegCtrl.js
index cmt
Merge remote-tracking branch 'origin/master'