Merge origin/master

Conflicts:
	SmartWinWin/nbproject/project.properties