Action device volume level'
Action: alarm
Merge branch 'alarm' into mytest_volum_alarm

Conflicts:
	profilematic/src/qmlbackend/qmlactioneditmodel.cpp
	profilematic/src/qmlbackend/qmlruleutil.cpp
	profilematic/src/qmlbackend/qmlruleutil.h
	profilematicd/profilematicd.pro
	profilematicd/src/logic/actionfactory.cpp
	profilematicd/src/model/ruleaction.cpp
	profilematicd/src/model/ruleaction.h
Finish merge
Merge fixes.
More merge fixes
Alarm action
Merge branch 'alarm' into mytest_volum_alarm
Alarm fixes
Merge branch 'alarm' into mytest_volum_alarm
Setting snooze as default 10 minutes if it's not set. Platform default is not used as it seems to be not user definable and thus confusing to use.
Merge branch 'alarm' into mytest_volum_alarm
Prepare for 2.1.0 release.