integration gridster
Merge branch 'UIV2' of github.com:capensis/canopsis into UIV2

Conflicts:
	sources/externals
	sources/webcore/var/www/canopsis/canopsis.js