Spam
Merge branch 'master' of https://github.com/kotick/Whisky

Conflicts:
	Whisky-web/src/java/managedBeans/HomeMB.java