exportes
ergem
fixed merge
added default layout and more options
updated templates
removed test
update