add a note about hsqldb data location (fix #496)
translation of additional entries
Merge pull request #497 from ekovi/patch-1

translation of additional entries
Creating template
Merge remote-tracking branch 'test/master'
detect categories in opml files by checking if they have children
fix scrolling issues on some mobile devices (#482)
wicket update
Merge branch 'master' of https://github.com/Athou/commafeed
don't compare strings with ==
added log4j entry for metrics
retrieve the final url after potential http 30x redirect
store and use urlAfterRedirect if different than the actual url
initial metrics page setup
fix issue where only the first directive was shown
display gauges as well
Merge branch 'master' of https://github.com/Athou/commafeed