Facebook integration
Merge branch 'master' of https://github.com/timosl/interwerk.git

Conflicts:
	src/main/webapp/components/product-detail-table.jsp