TranslatioN
Merge branch 'master' of github.com:redhog/overvakning

Conflicts:
	stories.json