Updated search functionality, added categories for for video pages..
Merge branch 'master' of github.com:AleksandarGajic/Master

Conflicts:
	Master.Web/bin/Master.Web.dll
	Master.Web/bin/Master.Web.pdb
	Master.Web/obj/Debug/Master.Web.csproj.FileListAbsolute.txt
	Master.Web/obj/Debug/Master.Web.dll
	Master.Web/obj/Debug/Master.Web.pdb
	Master.Web/obj/Debug/ResolveAssemblyReference.cache
	Master.Web/scripts/app.js