Ultima 07-08-2014
Merge branch 'diskjork-2.0' of https://github.com/diskjork/proconsele
Merge remote-tracking branch 'origin/lukatonson-1.0'