merge
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork

Conflicts:
	Codice/server/sqlite/myTalk.sqlite