Added Undo / Redo and Optimize for Debug #46

Merged
merged 11 commits into from Sep 8, 2014