updated aux-config
Merge remote-tracking branch 'origin/master'

Conflicts:
	Netbeans-Project/.nb-gradle/profiles/private/aux-config