added cancan and role_model, now have 3 user roles
merging
limiting the number of conversations on the home page
fixing mulitple recent messages block on index page
Merge branch 'master' into dashboard

Conflicts:
	app/views/home/index.html.erb
	db/schema.rb