Merge branch 'develop'
Release version: 0.5.1
Merge branch 'master' of github.com:neontribe/cottage-booking
Release version: 0.5.2
Merge branch 'develop'