https://jira.webmedia.eu/browse/ITACLOUD-59
Merge branch 'master' of https://github.com/rolkis/opennode-console

Conflicts:
	app/view/Viewport.js
https://jira.webmedia.eu/browse/ITACLOUD-59
Merge branch 'master' of https://github.com/rolkis/opennode-console
https://jira.webmedia.eu/browse/ITACLOUD-59
Merge branch 'master' of https://github.com/rolkis/opennode-console
https://jira.webmedia.eu/browse/ITACLOUD-59
Merge branch 'master' of https://github.com/rolkis/opennode-console