try to fix heroku bug
try to fix heroku bug
change comment to user_comment to avoid namespace conflicts with active admin
move active admin to the bottom of the routes file
Merge branch 'master' of heroku.com:imi-maps

Conflicts:
	app/controllers/user_comments_controller.rb
	config/routes.rb
rename user_internships_controller to internships_controller