Compile for Marc
Merge remote-tracking branch 'origin/master'

Conflicts:
	esir.dom12.nsoc-core/esir.dom12.nsoc.Android/pom.xml
for marc