Merge pull request #1 from lcycat/master

Getting update from master
Update XMLParser.java
Update Building.java
Merge pull request #13 from kye-13/master

updating from master