Working pom. logback.
Merge branch 'master' of https://github.com/brendan-poole/soascape

Conflicts:
	pom.xml