Modify multiple pages, add settings pages and add settings controller.
Merge branch 'master' of https://github.com/taxet/Msi-Project.git

Conflicts:
	Msi-Project/WebContent/WEB-INF/pages/app/history.jsp
	Msi-Project/WebContent/WEB-INF/pages/app/portfolio.jsp
	Msi-Project/WebContent/WEB-INF/pages/app/profile.jsp
	Msi-Project/WebContent/WEB-INF/pages/app/transaction.jsp
	Msi-Project/WebContent/finalProject.sql
	Msi-Project/src/com/mercury/demand/web/controller/HistoryController.java