Merge branch 'master' of https://github.com/richprze/wedding into develop
Merge branch 'develop' of https://github.com/richprze/wedding into develop
Merge branch 'release-1.3' into develop
Changed brunch text, removed activities.
Merge branch 'develop' of https://github.com/richprze/wedding into hotfix
Merge branch 'hotfix'