Dodging merge conflicts
Merge remote-tracking branch 'upstream/master' into jp508
Duck, it's another conflict
Just dodged another merge conflict
Merge remote-tracking branch 'upstream/master' into jp508
Merge pull request #627 from stowellm/ms618

Remove the old touch listener and added color changing to selected cells...
Made zee menu look like Virinchi's.  And this is a working version of that except for the parts that Jeremy broke, but whatever.  *Sigh* Whatever
Merge remote-tracking branch 'upstream/master' into ra553
Merge pull request #628 from Rajia/ra553

Ra553 --See commit messages
Added data saving to manual -- to be tested
Merge remote-tracking branch 'upstream/master' into jp508
Merge pull request #629 from jaypoulz/jp508

Jp508 -- Potentially finished added data saving to manual
Fixed Manual data saving after Jeremy implemented it