merging globalnewsdevautomation to master
modified .svn stuff