corrected an null pointer exception in lines
Merge branch 'master' of https://github.com/edourden/CineMetro

Conflicts:
	.idea/libraries/play_services_5_0_77.xml