makeDB and Test
Merge branch 'master' into mad
26.04.2013 - HotFix
Merge pull request #21 from oyvang/mad

Mad