updated routes

Conflicts:
	Gemfile
removed RequestStatusType and RequestType entries from ability.rb