Modify license.
Merge branch 'master' of github.com:leonson/smartanws
Modify state and city.
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	WebContent/js/license.js