Merge branch 'release/0.0.4'
Merge branch 'develop'
update template
Merge branch 'master' into develop

Conflicts:
	app/views/exakat_press/nodes/node_type_event_index.html.haml