nb
Merge remote-tracking branch 'origin/master'

Conflicts:
	apolune/src/nbproject/private/private.xml