Bug 3231, 2500: Major overhaul in collage annotation markup, for performance and functional fixes.
Several remaining bug fixes for collage performance.
Readd heatmap.
Heatmap additional work: printing. Fixed indentation in collages/show.
Additional performance, refactoring tweaks.
Issue 3466.
Add settings
Add settings route
Add support the application of user preferecnes
change reset password by email to reset password by login
fix typo
add login retrieval
bump rails to 2.3.16
readding forgot password
Reorganzie control placement