moving directories
Merge remote-tracking branch 'origin/master'

Conflicts:
	Grunt_tasks/uglify.js