Updated REST project
Merge branch 'master' of github.com:HuiLin2013/Web-Service-and-Cloud-Systems

Conflicts:
	Assignment1/calculatorRest/.classpath