aside and map blocks done
Merge branch 'master' of https://github.com/epifanov/travel