Add undo and redo buttons
Add initial implementation for undo/redo
Merge branch 'develop'