Merge origin/master

Conflicts:
	cinema-ejb/nbproject/project.properties