Merge pull request #28 from Esri/v.next

Merging into master for v10.2.4 release
Merge branch 'master' into jNery/Editing2