Merge branch 'develop' into theme_bootstrap
bootstrap v.3.3.1
Merge branch 'theme_bootstrap' into develop