fix
Merge branch 'mergeAURELIETOMMY' of github.com:K4PSuL/2uchW1n into mergeAURELIETOMMY

Conflicts:
	src/com/iia/touchwin/ui/StatsActivity.java
	src/com/iia/touchwin/utils/ConnectWebService.java