[code] jslint
Merge branch 'develop' into develop-design

Conflicts:
	app/front/app-controller-table.js