Added unfinished XML parser.
Merge master and task4xml - resolving conflicts