Merge branch 'alpha'

Conflicts:
data/js/movies.js
get_file_info.php
index.php