Entity and database design
Merge remote-tracking branch 'origin/master'

Conflicts:
	grouptabs-backend/src/main/java/grouptabs/backend/representations/KeyFactory.java