Merge branch 'tagwork'

Conflicts:
	NextFlicksMVC4/Controllers/Admin/AdminController.cs
Merge branch 'tagwork' of github.com:tankorsmash/NextFlickMVC4_Git into tagwork
Working on DB updating and building.
With tankorsmash's help we wrote a function to parse the netflix catalog
and pull out all the genres and update the database with any new ones.
Now workign on getting fulldbbuild() to update genres, pull all files and
update database.
Right now I need to add soem error checkign to the Full() or the part of
fulldbbuild() that tries to add movies to the db. Do a LINQ query to see
if the movie exists before adding the new ones. That way it will build all
movies if none exist or just add new ones if the db already exsists.
Merge branch 'master' of github.com:tankorsmash/NextFlickMVC4_Git

Conflicts:
	NextFlicksMVC4/Controllers/Admin/AdminController.cs