Merge branch 'master' of https://github.com/epicallan/cinema

Conflicts:
	wp-content/themes/starkers-master/home_page.php
html 3
Merge branch 'master' of https://github.com/epicallan/cinema