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

Conflicts:
	Codice/client/js/template/CallTemplate.html
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork