Merge pull request #790 from UM-USElab/2014-09-17--schema_errors--TKT#2294

2014 09 17  schema errors  tkt#2294
AJ-2266 change 'close' button to 'update settings', implement angular animations on modal fadeout