first steps towards #102
Merge branch 'develop' of https://github.com/buddycloud/hosting into develop