Added new functionallity
Minor fixed
Merge branch 'master' of https://github.com/Tonven/tabletteam

Conflicts:
	src/main/java/app/Dial.java