moep
Merged 'dev'.
dev/stage build configs
dev/stage configs
Merged 'dev'.

Conflicts:
	app/less/base.less
stage/dev deploy task fixed
Merged 'dev'.
Finish gui-talks-cam-293
Merged 'dev'.
file will be created
Finish e2e_tests
test env fixed
update positioning left and right messages
Merged 'dev'.
bugfix
Finish messaging
bugfix login error
update message gui
added option "test" to compile script
test deploy added, used on jenkins
Merge branch 'origin/dev'