Updated schema snapshot
minor modification
Added dev server
Added README
Restructured index page
Added watchlist feature
Merge branch 'wishlist'
Added watchlist on userpage
minor modifications
Bugfix: display specified user's watchlist
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