task 564 - edit html
task 548 - filter
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	src/SD/UserBundle/Entity/UserRepository.php