Aus WEB-INF
Merge branch 'master' of github.com:workflo/wiki