Tx task 1st version
Merged conflict
Merge branch 'master' of https://github.com/hexanome/setre2013

Conflicts:
	app/IARProject.dep
	app/settings/IARWorkspace.wsdt