removed conflict from ant build.launch
Merge branch 'aws-temp' of https://github.com/IVPR/Weave.git into aws-temp
Fixing CSS issues with merge