Modified version ranges slightly.
Merge branch 'master' of github.com:aetheric/shiva-web

Conflicts:
	pom.xml