First test runs for new DB structure, some minor bugfixes
Merge branch 'master' of gh:/dadarakt/jamon