commit controller
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	src/controller/Controller.java
Merge branch 'master' of github.com:leonson/smartanws
e
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	src/controller/LicenseAction.java
the refinement of findOffice with recommendation site
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	WebContent/findOffice.jsp