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

Conflicts:
	src/com/wise/wawc/VehicleFriendActivity.java
321