documentation/testing/refactoring
documentation/testing/refactoring
documentation/testing/refactoring
Merge origin/master

Conflicts:
	XXEBugFind/nbproject/project.properties