Implements Initial Prototype's 1/13/2014 code review issues.

Reverts .ignore file.  Converts anonymous classes in main_activity to
inner classes in main_activity.  Adds icons missing from initial commit.