Merge branch 'master' of https://github.com/alexpi/site_template
Merge branch 'master' of https://github.com/alexpi/site_template