Secret Santa working
Merge branch 'master' of https://github.com/davekenny/buymestuff

Conflicts:
	buymestuff/src/com/servlets/Friends.java
	buymestuff/target/classes/com/lib/Keyspaces.class
	buymestuff/target/classes/com/model/UserModel.class
	buymestuff/target/classes/com/servlets/DoCreateWishList.class
	buymestuff/target/classes/com/servlets/DoRegister.class
	buymestuff/target/classes/com/servlets/Profile.class
	buymestuff/target/classes/com/stores/ListStore.class

buymestuff/target/m2e-wtp/web-resources/META-INF/maven/uk.ac.dundee.comp
uting.aec.buymestuff/buymestuff/pom.properties