gulpfile.js angepasst
Merge branch 'master' into myPlant

Conflicts:
	gulpfile.js
	src/scripts/Router.js