Votes and Blocks
Merge branch 'meetings' of https://github.com/regs0311/dynameet into meetings

Conflicts:
	dynameet/app/Controller/OrganizersController.php