some style changes
Merge branch 'master' of github.com:SilexLab/Silex

Conflicts:
	lib/style/Style.class.php
	lib/style/StyleFactory.class.php