Reverted Database Work

Damn you old Versions.

TODO: Everything
Merge remote-tracking branch 'origin/master'

Conflicts:
	RitoConnector.v12.suo