Label und Tag Entity
Merge branch 'master' of https://github.com/c15r/feedo.git

Conflicts:
	ch.bfh.swos.feedo.domain/src/main/java/META-INF/persistence.xml