modifs test
Merge branch 'master' of https://github.com/K4PSuL/TouchWin.git

Conflicts:
	res/layout/activity_connection.xml