Update
Merge branch 'master' of https://github.com/FinstererFred/MovieDB

Conflicts:
	ajax.php
	mov.html
	prs.php
	strap.php