Modify the front-end web service.
Add getStates and getCities.
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	WebContent/header.jsp