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

Conflicts:
	res/layout/choice_maintain.xml
	res/layout/new_vehicle.xml
Merge branch 'master' of https://git@github.com/wisegps/Wawc.git

Conflicts:
	res/layout/brank_adapter_list.xml
111