git ignore
Merge branch 'develop'
Merge branch 'develop'
structural modifications
Merge branch 'master' of github.com:bicubic/Bicubic-PHP-Framework into develop