removing upcoming stuff, moved projs up
Merge branch 'master' of github.com:WiWa/wiwa