Edit from tablet
Merge branch 'master' of https://github.com/krotovic/diamond-cms.git