fixed some dependencies with new require config
Merge branch 'cloud_management_refactor'

Conflicts:
	Gruntfile.js