cleaning
cleaning
Merge branch 'master' of https://github.com/ESIR3-NSOC/NSOC-2012

Conflicts:
	esir.dom12.nsoc-core/.DS_Store
Fixing beugs