Merge branch 'master' of github.com:perepelytsya/settingsloader

Conflicts:
	src/com/bazaarvoice/settingsloader/Loader.java
	src/com/bazaarvoice/settingsloader/WriterToFile.java
	src/com/bazaarvoice/settingsloader/xml/XMLParser.java