scudo root init
scudo client
bernhard's app merge
to remove and ignore
stable
bower crypto
peace2
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
tiger setup
tiger setup
tiger setup
tiger update 1
tiger update 1
tiger update
tiger update 2
user management update