test
Merge branch 'master' of https://github.com/bookstoreProject/Trunk

Conflicts:
	BookStore-JEE6-V0/src/model/ClientManager.java