fixed "edit item"-bug
Merge branch 'master' of https://github.com/nicholaskariniemi/grubfs
Merge branch 'master' into feature/real_time_sync