renamed classes because of naming convention;
added button at main for testing of voting activity
Merge branch 'master' of github.com:ScriptozavrGaming/Mafia

Conflicts:
	Mafia/.idea/workspace.xml
	Mafia/res/layout/set_nicknames.xml
	Mafia/src/Scriptozavr/Mafia/Activities/ChoosingRoles.java
	Mafia/src/Scriptozavr/Mafia/Activities/Main.java