localization buttons and set margin to error message
Merge branch 'release/2014.09.23' of https://github.com/DonutWorks/Ari into release/2014.09.23