Set dev path
Working json config
Add deploy task and update dev task
Merge branch 'master' into develop

Conflicts:
	gulpfile.js