Bootstrap now has includes and such for roleEngine and role Objects
Couple Formatting changes
Merge remote-tracking branch 'origin/master'