a change from Netbeans by user 1
Merge origin/master

Conflicts:
	file_1