Hide clear icon in jeditable fields
Make the customized landing pages responsive
Tweak custom landing page mediaquery
Merge branch 'bootstrap3' of https://github.com/oaeproject/3akai-ux into issue-3672
Follow up on custom landing page review
Merge pull request #3678 from nicolaasmatthijs/issue-3678

`Rename` shouldn't have `x` on IE10
Merge branch 'bootstrap3' of https://github.com/oaeproject/3akai-ux into issue-3672
Adjust margins for mobile devices
Removed redundant docs
Add some margin to error pages
Synchronized translations
Merge pull request #3685 from nicolaasmatthijs/issue-3685

Error pages should have padding on small screens
make markdown-pre-code blocks use whitespace: pre
Synchronized Terms and Conditions
Merge branch 'master' of https://github.com/oaeproject/3akai-ux
Fix regression where current version of a file could be restored
Merge branch 'revisionRestoreRegression' of https://github.com/bp323/3akai-ux into revisionRestoreRegression
Merge branch 'issue-3660' of https://github.com/stuartf/3akai-ux into issue-3660
Merge origin/master and fix conflicts