bernhard's app merge
bower crypto
peace 3
Merge remote-tracking branch 'origin/elephant' into scudo-client
Merge remote-tracking branch 'origin/master' into scudo-client

Conflicts:
	app/scss/scudo-root.css
	app/scss/scudo-root.css.map
scudo-client-updates