add code style
Merge pull request #1043 from mariansollmann/issue-1043

apply new codestyle
Fixed CM_ModelAbstractTest failing in some random conditions
Merge pull request #1048 from fauvel/issue-1048

Fix CM_ModelAbstractTest failing at random
Merge branch 'master' of github.com:cargomedia/CM into issue-1041

Conflicts:
	library/CM/Form/Abstract.js