Updating
Adjusting logo style a bit and configuring staging database
Settings
Merge branch 'acacia'

Conflicts:
	db/dump.sql
	src/cyclos.properties