fixed null state bug
fixed merge conflicts
fixed null values
Merge branch 'feature/smart-content' of git://github.com/sulu-cmf/SuluContentBundle into feature/template-selection

Conflicts:
	Repository/NodeRepository.php
	Repository/NodeRepositoryInterface.php
implemented preview events