add missing annotorious icons
add missing config parameter to production.rb file
update devise for security vulnerability
resolve merge conflicts