adding edit feature
Merge branch 'master' of github.com:Fuzati/voloforce