edit notice error fixed
Merge branch 'release/2014.10.17' of https://github.com/DonutWorks/Ari into release/2014.10.17