Merge branch 'hotfix/2013-11.0.4'
Merge branch 'release/2013-12.1'
Constructor of classes are now compared with the toString() method
Merge branch 'hotfix/2013-12.1.1' into develop