no message
Merge branch 'master' of https://github.com/dordal/userballot

Conflicts:
	server_app/views/home.blade.php