Rx
Merge branch 'master' of https://github.com/hexanome/setre2013

Conflicts:
	app/settings/IARWorkspace.wsdt
	app/source/shared/synchronization.c
	app/source/tasks/record_task.c