catch-up master
Merge branch 'master' of https://github.com/caresa/alpha_app into gh-pages
merge
slide g and h
work on images on b tile