added web
Merge branch 'master' of github.com:vildhet/octopus

Conflicts:
	.gitignore
	web-octopus/target/maven-archiver/pom.properties
	web-octopus/target/octopus/WEB-INF/web.xml

commit1