colinwren/Candy — pull request #17 by colinwren (2013-08-17 19:42:40+00:00)
Title: Merge master into dev

I was developing in master accidentally and will develop in dev from now on.