MAJOR rework, WIP
Merge origin/master

Conflicts:
	database/TimeCloud.sqlite