Merge branch 'master' into develop
Bugfix for bxslider moved to unminified js
Merge branch 'develop'