fixed action file error
Merge branch 'master' of https://github.com/Daramkun/kHackathonKinectAlarm

Conflicts:
	KinectAlarm/ActionCollection.cs