requireJS fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/init.js
	public/modules/dataService.js
merge