vista edit_entry
Merge branch 'master' of https://github.com/smaass/sar2014