js commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/app/commons/view.js
Merge remote-tracking branch 'origin/master'
js commit