removing nh-pages from dev
Merge remote-tracking branch 'projet_original_master/dev' into dev

Conflicts:
	fr.cnes.sitools.ext.astronomy/build/struct.xml
Javadoc
Merge branch 'master' into dev