Merge branch 'hotfix/1.0.7' into develop

Conflicts:
	app/views/layouts/_header.html.erb
add target blank
fix conflicts