Merge branch 'fryspharmacy'
Merge branch 'master' of https://github.com/luciddesign/bootstrapify