Merge branch 'master' of https://github.com/MichaelSu1983/REST-U-I

Conflicts:
	src/main/java/client/TestServlet.java
	src/main/webapp/WEB-INF/exe/AuthorizationHeader.txt
	src/main/webapp/WEB-INF/exe/sbs.txt

	target/m2e-wtp/web-resources/META-INF/maven/client/Myclient/pom.properties