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

Conflicts:
	lib/controllers/execute.js
	lib/controllers/query.js
Merge remote-tracking branch 'origin/master'
임계치 발생현황