mainPage development
Merge branch 'master' of https://github.com/lorenariel/123456

Conflicts:
	main/java/com/beans/PublisherBookBean.java
	main/java/com/spring/services/db/impl/ManageBookPageLocationServiceImpl.java
	main/webapp/component/promotion/publisherInfo.xhtml
	main/webapp/component/publisherBook.xhtml