rSmart/3akai-ux — pull request #54 by johne (2012-02-09 22:01:41+00:00)
Title: fixed some problems with the merge

ACAD-145