Bootstrap theme SB admin v2
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#	modified:   .idea/.generators
#	modified:   .idea/.rakeTasks
#	modified:   .idea/dataSources.ids
#	modified:   .idea/dataSources.xml
#	modified:   .idea/modelunitednations.iml
#	new file:   .idea/runConfigurations/Development__modelunitednations.xml
#	new file:   .idea/runConfigurations/Production__modelunitednations.xml
#	new file:   .idea/runConfigurations/spec__modelunitednations.xml
#	new file:   .idea/runConfigurations/test__modelunitednations.xml
#	modified:   .idea/workspace.xml
#	modified:   Gemfile
#	modified:   Gemfile.lock
#	modified:   app/assets/javascripts/application.js
#	new file:   app/assets/javascripts/bootstrap.min.js
#	new file:   app/assets/javascripts/conference.js
#	new file:   app/assets/javascripts/conferences.js
#	new file:   app/assets/javascripts/jquery-1.10.2.js
#	new file:   app/assets/javascripts/plugins/dataTables/dataTables.bootstrap.js
#	new file:   app/assets/javascripts/plugins/dataTables/jquery.dataTables.js
#	new file:   app/assets/javascripts/plugins/demo/dashboard-demo.js
#	new file:   app/assets/javascripts/plugins/demo/flot-demo.js
#	new file:   app/assets/javascripts/plugins/demo/morris-demo.js
#	new file:   app/assets/javascripts/plugins/flot/excanvas.min.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.pie.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.resize.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.tooltip.min.js
#	new file:   app/assets/javascripts/plugins/metisMenu/jquery.metisMenu.js
#	new file:   app/assets/javascripts/plugins/morris/morris.js
#	new file:   app/assets/javascripts/plugins/morris/raphael-2.1.0.min.js
#	new file:   app/assets/javascripts/sb-admin.js
#	modified:   app/assets/stylesheets/application.css
#	new file:   app/assets/stylesheets/bootstrap.min.css
#	new file:   app/assets/stylesheets/conference.css.scss
#	new file:   app/assets/stylesheets/conferences.css.scss
#	new file:   app/assets/stylesheets/font-awesome/css/font-awesome.css
#	new file:   app/assets/stylesheets/font-awesome/css/font-awesome.min.css
#	new file:   app/assets/stylesheets/font-awesome/fonts/FontAwesome.otf
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.eot
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.svg
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.ttf
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.woff
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.eot
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.svg
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.ttf
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.woff
#	new file:   app/assets/stylesheets/plugins/dataTables/dataTables.bootstrap.css
#	new file:   app/assets/stylesheets/plugins/morris/morris-0.4.3.min.css
#	new file:   app/assets/stylesheets/plugins/social-buttons/social-buttons.css
#	new file:   app/assets/stylesheets/plugins/timeline/timeline.css
#	new file:   app/assets/stylesheets/sb-admin.css
#	modified:   app/controllers/application_controller.rb
#	new file:   app/controllers/conferences_controller.rb
#	modified:   app/controllers/welcome_controller.rb
#	new file:   app/helpers/conferences_helper.rb
#	new file:   app/models/ability.rb
#	new file:   app/models/announcement.rb
#	new file:   app/models/comittee.rb
#	new file:   app/models/conference.rb
#	new file:   app/models/delegation.rb
#	new file:   app/models/pariticipant_role.rb
#	new file:   app/models/participant.rb
#	new file:   app/models/participant_group.rb
#	new file:   app/models/role.rb
#	modified:   app/models/user.rb
#	new file:   app/views/conferences/create.html.haml
#	new file:   app/views/conferences/destroy.html.haml
#	new file:   app/views/conferences/edit.html.haml
#	new file:   app/views/conferences/index.html.haml
#	new file:   app/views/conferences/new.html.haml
#	new file:   app/views/conferences/update.html.haml
#	modified:   app/views/devise/sessions/new.html.erb
#	new file:   app/views/layouts/_content.html.erb
#	new file:   app/views/layouts/_navigation.html.erb
#	new file:   app/views/layouts/_side_navigation.html.erb
#	modified:   app/views/layouts/application.html.erb
#	new file:   app/views/welcome/index.html
#	deleted:    app/views/welcome/index.html.erb
#	new file:   app/views/welcome/theme.html
#	new file:   config/initializers/rails_admin.rb
#	modified:   config/routes.rb
#	new file:   db/migrate/20140329151251_create_conferences.rb
#	new file:   db/migrate/20140329151539_create_comittees.rb
#	new file:   db/migrate/20140329152006_add_name_to_conference.rb
#	new file:   db/migrate/20140329152410_create_participants.rb
#	new file:   db/migrate/20140329152611_create_roles.rb
#	new file:   db/migrate/20140329152838_add_conference_id_to_participant.rb
#	new file:   db/migrate/20140329153310_create_participant_groups.rb
#	new file:   db/migrate/20140329153428_participant_to_participant_group.rb
#	new file:   db/migrate/20140329153818_add_name_to_participant_group.rb
#	new file:   db/migrate/20140329154140_create_announcements.rb
#	new file:   db/migrate/20140329154206_add_conference_id_to_announcements.rb
#	new file:   db/migrate/20140329154915_create_delegations.rb
#	new file:   db/migrate/20140329155449_add_delegation_id_to_participant.rb
#	new file:   db/migrate/20140329155654_add_name_to_users.rb
#	new file:   db/migrate/20140329155859_add_surname_to_users.rb
#	new file:   db/migrate/20140329161931_comittee_to_participant.rb
#	new file:   db/migrate/20140329182641_create_pariticipant_roles.rb
#	new file:   db/migrate/20140329182848_participant_roles_to_participant.rb
#	new file:   db/migrate/20140329183025_user_to_roles.rb
#	modified:   db/schema.rb
#	modified:   db/seeds.rb
#	new file:   db/structure.sql
#	new file:   erd.pdf
#	new file:   spec/controllers/conferences_controller_spec.rb
#	new file:   spec/factories/announcements.rb
#	new file:   spec/factories/chairs.rb
#	new file:   spec/factories/comittees.rb
#	new file:   spec/factories/conference_managers.rb
#	new file:   spec/factories/conferences.rb
#	new file:   spec/factories/delegates.rb
#	new file:   spec/factories/delegations.rb
#	new file:   spec/factories/pariticipant_roles.rb
#	new file:   spec/factories/participant_groups.rb
#	new file:   spec/factories/participants.rb
#	new file:   spec/factories/roles.rb
#	new file:   spec/helpers/conferences_helper_spec.rb
#	new file:   spec/models/announcement_spec.rb
#	new file:   spec/models/chair_spec.rb
#	new file:   spec/models/comittee_spec.rb
#	new file:   spec/models/conference_manager_spec.rb
#	new file:   spec/models/conference_spec.rb
#	new file:   spec/models/delegate_spec.rb
#	new file:   spec/models/delegation_spec.rb
#	new file:   spec/models/pariticipant_role_spec.rb
#	new file:   spec/models/participant_group_spec.rb
#	new file:   spec/models/participant_spec.rb
#	new file:   spec/models/role_spec.rb
#	new file:   spec/views/conferences/create.html.haml_spec.rb
#	new file:   spec/views/conferences/destroy.html.haml_spec.rb
#	new file:   spec/views/conferences/edit.html.haml_spec.rb
#	new file:   spec/views/conferences/index.html.haml_spec.rb
#	new file:   spec/views/conferences/new.html.haml_spec.rb
#	new file:   spec/views/conferences/update.html.haml_spec.rb
#
Bootstrap theme SB admin v2
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#	modified:   .idea/.generators
#	modified:   .idea/.rakeTasks
#	modified:   .idea/dataSources.ids
#	modified:   .idea/dataSources.xml
#	modified:   .idea/modelunitednations.iml
#	new file:   .idea/runConfigurations/Development__modelunitednations.xml
#	new file:   .idea/runConfigurations/Production__modelunitednations.xml
#	new file:   .idea/runConfigurations/spec__modelunitednations.xml
#	new file:   .idea/runConfigurations/test__modelunitednations.xml
#	modified:   .idea/workspace.xml
#	modified:   Gemfile
#	modified:   Gemfile.lock
#	modified:   app/assets/javascripts/application.js
#	new file:   app/assets/javascripts/bootstrap.min.js
#	new file:   app/assets/javascripts/conference.js
#	new file:   app/assets/javascripts/conferences.js
#	new file:   app/assets/javascripts/jquery-1.10.2.js
#	new file:   app/assets/javascripts/plugins/dataTables/dataTables.bootstrap.js
#	new file:   app/assets/javascripts/plugins/dataTables/jquery.dataTables.js
#	new file:   app/assets/javascripts/plugins/demo/dashboard-demo.js
#	new file:   app/assets/javascripts/plugins/demo/flot-demo.js
#	new file:   app/assets/javascripts/plugins/demo/morris-demo.js
#	new file:   app/assets/javascripts/plugins/flot/excanvas.min.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.pie.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.resize.js
#	new file:   app/assets/javascripts/plugins/flot/jquery.flot.tooltip.min.js
#	new file:   app/assets/javascripts/plugins/metisMenu/jquery.metisMenu.js
#	new file:   app/assets/javascripts/plugins/morris/morris.js
#	new file:   app/assets/javascripts/plugins/morris/raphael-2.1.0.min.js
#	new file:   app/assets/javascripts/sb-admin.js
#	modified:   app/assets/stylesheets/application.css
#	new file:   app/assets/stylesheets/bootstrap.min.css
#	new file:   app/assets/stylesheets/conference.css.scss
#	new file:   app/assets/stylesheets/conferences.css.scss
#	new file:   app/assets/stylesheets/font-awesome/css/font-awesome.css
#	new file:   app/assets/stylesheets/font-awesome/css/font-awesome.min.css
#	new file:   app/assets/stylesheets/font-awesome/fonts/FontAwesome.otf
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.eot
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.svg
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.ttf
#	new file:   app/assets/stylesheets/font-awesome/fonts/fontawesome-webfont.woff
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.eot
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.svg
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.ttf
#	new file:   app/assets/stylesheets/fonts/glyphicons-halflings-regular.woff
#	new file:   app/assets/stylesheets/plugins/dataTables/dataTables.bootstrap.css
#	new file:   app/assets/stylesheets/plugins/morris/morris-0.4.3.min.css
#	new file:   app/assets/stylesheets/plugins/social-buttons/social-buttons.css
#	new file:   app/assets/stylesheets/plugins/timeline/timeline.css
#	new file:   app/assets/stylesheets/sb-admin.css
#	modified:   app/controllers/application_controller.rb
#	new file:   app/controllers/conferences_controller.rb
#	modified:   app/controllers/welcome_controller.rb
#	new file:   app/helpers/conferences_helper.rb
#	new file:   app/models/ability.rb
#	new file:   app/models/announcement.rb
#	new file:   app/models/comittee.rb
#	new file:   app/models/conference.rb
#	new file:   app/models/delegation.rb
#	new file:   app/models/pariticipant_role.rb
#	new file:   app/models/participant.rb
#	new file:   app/models/participant_group.rb
#	new file:   app/models/role.rb
#	modified:   app/models/user.rb
#	new file:   app/views/conferences/create.html.haml
#	new file:   app/views/conferences/destroy.html.haml
#	new file:   app/views/conferences/edit.html.haml
#	new file:   app/views/conferences/index.html.haml
#	new file:   app/views/conferences/new.html.haml
#	new file:   app/views/conferences/update.html.haml
#	modified:   app/views/devise/sessions/new.html.erb
#	new file:   app/views/layouts/_content.html.erb
#	new file:   app/views/layouts/_navigation.html.erb
#	new file:   app/views/layouts/_side_navigation.html.erb
#	modified:   app/views/layouts/application.html.erb
#	new file:   app/views/welcome/index.html
#	deleted:    app/views/welcome/index.html.erb
#	new file:   app/views/welcome/theme.html
#	new file:   config/initializers/rails_admin.rb
#	modified:   config/routes.rb
#	new file:   db/migrate/20140329151251_create_conferences.rb
#	new file:   db/migrate/20140329151539_create_comittees.rb
#	new file:   db/migrate/20140329152006_add_name_to_conference.rb
#	new file:   db/migrate/20140329152410_create_participants.rb
#	new file:   db/migrate/20140329152611_create_roles.rb
#	new file:   db/migrate/20140329152838_add_conference_id_to_participant.rb
#	new file:   db/migrate/20140329153310_create_participant_groups.rb
#	new file:   db/migrate/20140329153428_participant_to_participant_group.rb
#	new file:   db/migrate/20140329153818_add_name_to_participant_group.rb
#	new file:   db/migrate/20140329154140_create_announcements.rb
#	new file:   db/migrate/20140329154206_add_conference_id_to_announcements.rb
#	new file:   db/migrate/20140329154915_create_delegations.rb
#	new file:   db/migrate/20140329155449_add_delegation_id_to_participant.rb
#	new file:   db/migrate/20140329155654_add_name_to_users.rb
#	new file:   db/migrate/20140329155859_add_surname_to_users.rb
#	new file:   db/migrate/20140329161931_comittee_to_participant.rb
#	new file:   db/migrate/20140329182641_create_pariticipant_roles.rb
#	new file:   db/migrate/20140329182848_participant_roles_to_participant.rb
#	new file:   db/migrate/20140329183025_user_to_roles.rb
#	modified:   db/schema.rb
#	modified:   db/seeds.rb
#	new file:   db/structure.sql
#	new file:   erd.pdf
#	new file:   spec/controllers/conferences_controller_spec.rb
#	new file:   spec/factories/announcements.rb
#	new file:   spec/factories/chairs.rb
#	new file:   spec/factories/comittees.rb
#	new file:   spec/factories/conference_managers.rb
#	new file:   spec/factories/conferences.rb
#	new file:   spec/factories/delegates.rb
#	new file:   spec/factories/delegations.rb
#	new file:   spec/factories/pariticipant_roles.rb
#	new file:   spec/factories/participant_groups.rb
#	new file:   spec/factories/participants.rb
#	new file:   spec/factories/roles.rb
#	new file:   spec/helpers/conferences_helper_spec.rb
#	new file:   spec/models/announcement_spec.rb
#	new file:   spec/models/chair_spec.rb
#	new file:   spec/models/comittee_spec.rb
#	new file:   spec/models/conference_manager_spec.rb
#	new file:   spec/models/conference_spec.rb
#	new file:   spec/models/delegate_spec.rb
#	new file:   spec/models/delegation_spec.rb
#	new file:   spec/models/pariticipant_role_spec.rb
#	new file:   spec/models/participant_group_spec.rb
#	new file:   spec/models/participant_spec.rb
#	new file:   spec/models/role_spec.rb
#	new file:   spec/views/conferences/create.html.haml_spec.rb
#	new file:   spec/views/conferences/destroy.html.haml_spec.rb
#	new file:   spec/views/conferences/edit.html.haml_spec.rb
#	new file:   spec/views/conferences/index.html.haml_spec.rb
#	new file:   spec/views/conferences/new.html.haml_spec.rb
#	new file:   spec/views/conferences/update.html.haml_spec.rb
#