:update: change criticity button and label display behavior
:update: weather takes care of ack in events
Merge branch 'master' of https://github.com/capensis/canopsis-webcore

Conflicts:
	var/www/canopsis/core/templates/actionbutton-changestate.html
	var/www/canopsis/uibase/widgets/weather/controller.js