Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
Merge origin/master