Automato/Automatopia — pull request #1 by DavidJFelix (2013-07-31 15:26:00+00:00)
Title: Merge development onto master

Get master up to date.