Formatting (use 4 spaces)
Merge branch 'master' of github.com:cargomedia/CM into formatting

Conflicts:
	library/CM/Form/Abstract.php
	library/CM/FormField/Abstract.php
	library/CM/FormField/Text.php
	tests/library/CM/Form/AbstractTest.php
	tests/library/CM/FormField/TextTest.php
Merge pull request #1069 from njam/formatting

Formatting (use 4 spaces)