Added Permission Model
Merge branch 'master' of github.com:stevemcquaid/cmunity
Added Squeel Gem, Added activities page, Added cosponsor model, Added approval model
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	db/schema.rb
Basic permissions, added some scopes and methods to models to help simplify permission process
Updated Gemfile and deploy config
Merge branch 'sean' of github.com:stevemcquaid/cmunity

Conflicts:
	app/models/group.rb
	app/views/groups/_all_groups.html.erb
Merge pull request #22 from stevemcquaid/sean

Updated gemfile and deploy configuration
Updated Gemfiles
Merge pull request #23 from stevemcquaid/sean

Updated Gemfiles
Updated schema, attempting to fix passenger error
Merge pull request #24 from stevemcquaid/sean

Updated schema, attempting to fix passenger error
Fixed errors in cancan ability file, hopeful this will fix the passenger errors
Merge pull request #25 from stevemcquaid/sean

Fixed errors in cancan ability file, hopeful this will fix the passenger...
Setting up tests
some changes
Merge branch 'steve' into sean
Disabled avatar validations
added rspec gem to gemfile
installed cucumber