Merge pull request #700 from differentreality/roles_updated

Roles updated

app/assets/javascripts/application.js

@@ -37,6 +37,8 @@
 //= require osem-switch
 //= require osem-bootstrap
 //= require osem-commercials
+//= require unobtrusive_flash
+//= require unobtrusive_flash_bootstrap
 
 $(document).ready(function() {
     $('a[disabled=disabled]').click(function(event){