1233123
Merge branch 'master' of https://git@github.com/wisegps/Wawc.git

Conflicts:
	src/com/wise/sql/DBExcute.java
	src/com/wise/wawc/MyCollectionActivity.java
Merge branch 'master' of https://git@github.com/wisegps/Wawc.git
1231