desktop update after vacation
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/untitled/cine_details.php
cine 21/8/2014