Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/service/ClasspageService.java
	src/main/java/org/ednovo/gooru/client/service/ClasspageServiceAsync.java
	src/main/java/org/ednovo/gooru/server/request/UrlToken.java
	src/main/java/org/ednovo/gooru/server/service/ClasspageServiceImpl.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties