ecomba/collaborator — pull request #33 by triathlonboy (2013-05-22 12:06:27+00:00)
Title: Fixed the merge of all three JS bits

:)