conditional module def
Merge remote-tracking branch 'origin/master'

Conflicts:
	GsGenericCtrl.js
	index.js