Ordner mit Web Inf
... mit Web Inf
Merge branch 'master' of https://github.com/whit3hat88/mwi.wb.git

Conflicts:
	mwi.wb/src/com/example/mwi_wb/Mwi_wbUI.java
Merge branch 'master' of https://github.com/whit3hat88/mwi.wb.git

Conflicts:
	mwi.wb/src/com/example/mwi_wb/Mwi_wbUI.java