Merge branch '29-merge-cdvmessages-into-localization' into 'master'

Resolve "Merge CDVMessages into Localization"

Closes #29

See merge request betzms/citydoctor2!1
1 job for master in 2 minutes (queued for 1 second)