Merge branch 'master' of https://github.com/furiozare/wenny

Conflicts:
	src/Han/AdminBundle/Form/Type/BrandType.php
Merge branch 'master' of https://github.com/furiozare/wenny
Merge branch 'master' of https://github.com/furiozare/wenny

Conflicts:
	src/Han/AdminBundle/Form/Type/BrandType.php