removed swap files
fixed build.xml
Merge remote-tracking branch 'upstream/master'