omoman/hackathon — pull request #2 by benk691 (2013-11-23 16:22:51+00:00)
Title: Full merge of contributors code

Full merge of all contributors code.