Merge branch 'develop' into admin
add username support to password recovery
Add non RESTful authorization
add basic dashboard
restructor devise paths to allow user CRUD
add user search and selection to admin dashboard
switch to name based user display
Merge branch 'admin' into develop