Merge origin/master

Conflicts:
	.gitignore
	cinema-ejb/nbproject/build-impl.xml
	cinema-ejb/nbproject/genfiles.properties
	cinema-ejb/nbproject/project.properties
	cinema-ejb/nbproject/project.xml
	cinema-war/nbproject/project.properties
	nbproject/project.properties
Merge origin/master

Conflicts:
	cinema-ejb/nbproject/project.properties