Added proxy support and global locations
Re-added grails-app folder needed for packaging into war
Merge branch 'proxy_support'