Base template
Merge branch 'master' of https://github.com/danbinks/base-php-template