rentCal4,5,8 modified by Steven Chen
rentCal4,5,8 for backend implementation added by Steven
Merge branch 'master' of https://github.com/IrisG33/Capstone

Conflicts:
	Capstone/build/web/WEB-INF/classes/DB/Form.class
	Capstone/nbproject/private/private.properties