Fixing Bugs with Add and Edit items
Merge remote-tracking branch 'origin/master'