2.0.4?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vandel/src/main/resources/META-INF/persistence.xml
Merge pull request #3 from pisi79/master

parametric pom