Titaneman/Zappy — pull request #1 by Titaneman (2014-07-06 18:38:45+00:00)
Title: Merge David (and Vice-Pré) branch

They worked so we have to merge man