Merge branch 'develop', remote-tracking branch 'origin' into develop
Add Bonfire.Roles.Add permission to database
ModuleBuilder Removed prefix from ActiveRecord calls
Merge pull request #497 from mwhitneysdsu/ModuleBuilder

ModuleBuilder Removed prefix from ActiveRecord calls
Merge pull request #498 from mwhitneysdsu/Permissions

Add Bonfire.Roles.Add permission to database
Merge branch 'develop', remote-tracking branch 'origin' into develop
Fixing the class name of the migration
Merge pull request #500 from Deledrius/d550bcf05fd4954a1ce86dab54dd6f1d4aba9d02

Separate asset-combining configuration option
Updating the comments for js_combine and css_combine
Implementing default context settings for user roles
Added migration to update session table for IPv6 Addresses for CI2.1.1 upgrade
Merge branch 'develop' of github.com:ci-bonfire/Bonfire into develop
Renamed migration file to match up with current migrations
Upgraded CodeIgniter to 2.1.1 after testing on Multi Dev sites.
Removing extra migration I added by mistake
adding TIME type to array of field types where value/length isn't possible
MY_Model: adding a method to allow a model to specify a different DB connection setting from the Bonfire site
Form_helper: adding a checkbox method
Removing form_checkbox helper again - it conflicts with the CI form_radio
Adding a shortcut to the index page of the current module