Merge conflicting branches.
Merge branch 'feature-root-site' of ssh://github.com/vndmtrx/akasha into feature-root-site