Some changes
Merge branch 'master' of https://github.com/tigmnmann/distribution
Modified cdataparser and .gitignore