Merge remote-tracking branch 'remotes/origin/feature/DAO' into develop

Conflicts:
	src/main/java/resources/LinkedInResource.java