Set jquery-rails to 2.3 to work with ActiveAdmin
Fix issues with groups and multi-tenancy, provision user, roles, rights for new group
Add startup script for mailcatcher and add to devstart and shutdown for mailcatcher to devstop
Files for startque addition
Load program for AAC data
Add description field to parse_entry
Merge branch 'master' of https://github.com/chipzx/fetchit

Conflicts:
	Gemfile
	app/views/devise/registrations/new.html.erb
	config/environments/development.rb
	db/schema.rb