Merge branches 'develop' and 'develop' of github.com:RicardovanTongeren/sandwich into develop
Added simple edit en delete button, not yet done, but it's there for the show ;)