changed user id to string for dashboard controller mongoid query, removed double underscore from route
Merge branch 'master' of github.com:kristenhazard/epm-catalog