merged
no message
Merge branch 'master' into development

* master:
  merged
Merge branch 'development' of https://github.com/patricktuin/weddingangular into development

* 'development' of https://github.com/patricktuin/weddingangular:
  no message