Merge branch 'master' of https://github.com/Anton-Permnenev/Hackathon-november-2014

Conflicts:
	drawroll-host.html

modal works properly