Merge branch 'master' of https://github.com/vlebedeff/estate

Added missing forms
gem integration, updated few labels.
Merge branch 'master' of https://github.com/vlebedeff/estate