we are going to do analysis by city and by person
Merge branch 'master' of github.com:kymtwyf/TravelSteward

Conflicts:
	WebContent/util/queries.js
added sth
Merge branch 'master' of github.com:kymtwyf/TravelSteward

Conflicts:
	WebContent/manager/analysisByCountry.view.js
	WebContent/manager/app.view.js
	WebContent/util/uiFactory.js
analysis homepage ->analysis.view.js
Merge branch 'master' of github.com:kymtwyf/TravelSteward

Conflicts:
	WebContent/manager/analysisByCountry.view.js
	WebContent/manager/app.view.js
	WebContent/manager/masterdetail.view.js
	WebContent/util/uiFactory.js
slight change on the css
Merge branch 'master' of github.com:kymtwyf/TravelSteward