Merge branch 'develop' into release
fixes #463 preliminary javascript i18n
plugins updated translation in js
fixes #735 and #686
revert temp file stuff
figure this out later
fixes #653 issue
Merge branch 'release' of github.com:GetSimpleCMS/GetSimpleCMS into release
Merge branch 'develop' into release