new style
Merge remote-tracking branch 'origin/master'

Conflicts:
	logFile.2014-11-25.log
	src/main/resources/application.properties
	src/main/webapp/WEB-INF/tiles/layout/layout.jsp
	src/main/webapp/WEB-INF/tiles/view/header.jsp
	src/main/webapp/WEB-INF/tiles/view/home/home.jsp
	src/main/webapp/WEB-INF/tiles/view/home/packages.jsp
	src/main/webapp/WEB-INF/tiles/view/home/product-view.jsp
	src/main/webapp/WEB-INF/tiles/view/home/products.jsp
new style