update layout
Merge commit '497ba1395c388f5e5f767eb89918c553b2d63f7b' into dev
Merge commit '239b1c7d041b428da7003221fb6d83895d98c92b' into dev

Conflicts:
	app/templates/toolbar.html
Merge commit '77b7b9b08f79dedb05db5b298184d703cd5f2575' into dev
translations
Merge commit '6ed379e19df9a585e8547e2f96c8048beb0487cd' into dev
url fix
Merge branch 'nameshares'