#20: Creating new web module.
Merge branch 'master' of git@github.com:seedboxer/seedboxer.git

Conflicts:
	seedboxer-standalone/pom.xml