rev1 working base
Merge branch 'master' of https://github.com/gulliverrr/hestia-dev