Merge branch 'release/v1.0'
Merge branch 'release/v1.1'
Check assets precompile
Merge branch 'hotfix/fix-assets-javascripts'
Merge branch 'hotfix/fix-assets-javascripts' into develop
Remove ember references in application.js
Merge branch 'hotfix/remove-ember-references'
Merge branch 'hotfix/remove-ember-references' into develop
Include bootstrap helper
Merge branch 'hotfix/add-bootstrap-helpers'
Merge branch 'hotfix/add-bootstrap-helpers' into develop
Copy bootstrap helper to application helper
Merge branch 'hotfix/change-bootstrap-helper-to-application-helper' into develop