properties
Merge branch 'master' of https://github.com/nass59/tp5

Conflicts:
	TP5Cinema/nbproject/project.properties