Changes made by Michael Møller (spec@live.dk).
Merge branch 'master' of https://github.com/djaevlen/DickoApp.git