bug fixing
Merge remote-tracking branch 'origin/master'

Conflicts:
	nodejs/client/js/controllers.js