Merge origin/master

Conflicts:
	dodong2/nbproject/project.properties
	dodong2/web/BookStoreTemplate.xhtml
	dodong2/web/index.xhtml