ignore svn and xml
Merge branch 'staging' into production