Bugfix.
Merge branch 'master' of https://github.com/oele3110/XML-SS13-Group3
Rename due name conflict.
Move directory due import error.
Update Makefile
Add microdata support to proxy.