merge game
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rinkimai/src/rinkimai/pro/MainTabs.java