Updated build instructions
Merge branch 'i12' of https://github.com/oscarpicas/s2tbx into i12

Conflicts:
	pom.xml