Merge branch 'develop'
Fix bootstrap javascript issues
Merge branch 'master' into develop