DB config update, start work on events
Merge remote-tracking branch 'origin/master'

Conflicts:
	files/covers/default.jpg