Merge pull request #67 from zanata/translation-save-states

Save state functionality
Merge remote-tracking branch 'origin/master' into production-readify

* origin/master: