Bumped up version after release
Merge branch 'master' of https://github.com/slipstream/SlipStreamUI

Conflicts:
	pom.xml