Can send friend requests to other users.
Adding friends almost working. Quite a few bugs but should be fixed
fairly quickly.
Merge branch 'master' of https://github.com/davekenny/buymestuff.git

Conflicts:
	buymestuff/target/classes/com/lib/Keyspaces.class
	buymestuff/target/classes/com/model/UserModel.class
	buymestuff/target/classes/com/model/WishModel.class
	buymestuff/target/classes/com/servlets/GrantWish.class
	buymestuff/target/classes/com/servlets/User.class
	buymestuff/target/classes/com/stores/ListStore.class
	buymestuff/target/classes/com/stores/WishStore.class
	buymestuff/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	buymestuff/target/m2e-wtp/web-resources/META-INF/maven/uk.ac.dundee.computing.aec.buymestuff/buymestuff/pom.properties