Upload form mock-up.
Merge branch 'master' of https://github.com/Semantiq/easyrider

Conflicts:
	hardwareClient/src/main/resources/static/main.min.js
Re-generated grunt generated files.