Merge branch 'develop'
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/ceesvanegmond/laravel4-minify into develop