Konflikt 1
Merge branch 'master' of https://github.com/koradir/dmdb2014.git
Clean start