Merge branch 'master' of https://github.com/Brkk/text-share

Conflicts:
	src/main/java/com/uvic/textshare/service/rest/TextbookResource.java
	target/text-share-1.0-SNAPSHOT/WEB-INF/classes/com/uvic/textshare/service/model/Textbook.class
no message
Merge branch 'master' of https://github.com/Brkk/text-share

Conflicts:
	src/main/java/com/uvic/textshare/service/rest/TextbookResource.java
	target/m2e-wtp/web-resources/META-INF/maven/com.uvic.textshare/text-share/pom.properties
	target/text-share-1.0-SNAPSHOT/WEB-INF/classes/com/uvic/textshare/GuestbookServlet.class
	target/text-share-1.0-SNAPSHOT/WEB-INF/classes/com/uvic/textshare/SignGuestbookServlet.class
	target/text-share-1.0-SNAPSHOT/WEB-INF/classes/com/uvic/textshare/service/model/Textbook.class
no message