itexico/nova-web — pull request #10 by fsevillaitexico (2014-12-01 22:59:20+00:00)
Title: 42b

fixed conflicts to merge with master. Updated layout with template functionality.