Added marker files to skip rest server deployment, and ant tasks to update war file
Merge remote-tracking branch 'origin/master'