Merge branch 'master' of https://github.com/jbourdea/FreshBoxWebsite

Conflicts:
GFB/GFB_Default_Store.html