rolify and cancan
chris change
Merge pull request #20 from kyruscharities/scott2

chris change
Merge branch 'master' into maps-on-create

Conflicts:
	app/models/analysis.rb