add basic files for alarm-clock
Merge branch 'dev' into feature.alarm-clock

Conflicts:
	tags.json