Cleanup, still working!
Merge branch 'master' of https://github.com/hexanome/setre2013

Conflicts:
	app/settings/IARProject.dni