Merge branch 'feature/comments' of https://github.com/tagbangers/wallride into develop

Conflicts:
	src/main/java/org/wallride/core/repository/PageRepository.java