first commit on mybranch01
second commit on mybranch02
Merge branch 'mybranch01'

Conflicts:
	myexhibition-persistent/src/main/java/com/myexhibition/App.java