amahi/platform — pull request #27 by agmps18 (2014-03-09 11:15:48+00:00)
Title: Editing the layouts, solving some layout bugs

Resolved conflicts of Pull#25