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

Conflicts:
	app/views/index.html
Merge remote-tracking branch 'origin/master'
09/12 1:30