Add and Edit functionality added
Merge branch 'master' of https://github.com/rommen/octagon