- vote management
Merge branch 'master' of git://github.com/Oxind/OxindFeedbackBundle

Conflicts:
	Resources/views/Feedback/list.html.twig