adjust changes , change author location
adjust changes , change author location
Merge branch 'master' of https://github.com/lorenariel/123456

Conflicts:
	main/java/com/beans/PublisherBookBean.java