Merge branch 'master' of https://github.com/Zylius/project-bootstrap