added controller.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	front/controller.js
minor patches.