Made modifications of files that have to be copied in the build steps and other small reference changes to get the deployment test working
Worked on integration of analytics viewer and WPS requests
Updated Time Slider version (solves some bugs) and configured client to request to demo server
Solved dragging bug of layer control and tool panels
Merge branch 'master' into deploy_test

Conflicts:
	app/scripts/contrib/MapViewer/MapViewModule.js
Merge branch 'master' into fha-next

Conflicts:
	Gruntfile.js
	app/index.html
Minor adjustments after 'master' merge