Updated Store Manager
Updated Store Manager
Updated Store Manager
Merge origin/master

Conflicts:
	src/META-INF/persistence.xml