Merge branch 'master' of https://github.com/richprze/wedding into develop
bumped to version 1.2
Merge branch 'develop' of https://github.com/richprze/wedding into develop
Merge branch 'release-1.2' into develop