xmlScanner done
Merge origin/master
xmlScanner done, working on looping
Merge origin/master