UC 2014 Submission

Check in of all changes prior to Esri UC 2014