#165 modifying routes.rb
Merge branch 'develop' of github.com:DonutWorks/Ari into feature/issue-#165

Conflicts:
	app/views/admin/users/index.html.erb
	config/routes.rb
Merge pull request #177 from DonutWorks/feature/issue-#165

#165 modifying routes.rb