little change for functions.php
Merge branch 'master' of github.com:shibai/nova_movie
debug the new_movie.php and edit_movie.php and now the commit works
fix the conflicts, change some code of user_movie.php