merged cumbia-porting branch into master. Ported to cumbia. Inserted layouts