test
Merge branch 'master' of github.com:sandrocheng/sandro

Conflicts:
	project/ImageTrans/src/com/sandro/ImageTrans/TrafficStatsActivity.java
Merge branch 'master' of github.com:sandrocheng/sandro