Fixes
Merge branch 'master' of https://github.com/rabchev/real-est-tmpl