test
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyJpa/build/classes/META-INF/persistence.xml
2012-1-11