Added mod-users; Added movie editing
Merge branch 'mod-movie'

Conflicts:
	libs/myflick/routes.py
	templates/default.phtml
Added mod-users; Added movie editing
Merge branch 'mod-movie'
Merge branch 'mod-movie' into stable

Conflicts:
	libs/myflick/routes.py
	templates/default.phtml
Merge branch 'master' into stable
Minor bug fix