Av merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	LO54_Project/src/com/lo54project/webservice/service/ClientResource.java
	LO54_Project/src/com/lo54project/webservice/service/CourseResource.java
	LO54_Project/src/com/lo54project/webservice/service/CourseSessionResource.java
	LO54_Project/src/com/lo54project/webservice/service/LocationResource.java