Unknown changes
Merge branch 'master' of github.com:prickett/gitrepo

Conflicts:
	FeedsMvcSite/pom.xml
	FeedsMvcSite/src/main/java/org.sperbolink/facade/FeedsFacade.java
	FeedsMvcSite/src/main/resources/properties.inf
Tweaked for home machine