Merge branch 'master' into backbone

Conflicts:
	.gitignore

.gitignore

@@ -1,54 +1,127 @@
+# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
+[Bb]in/
+[Oo]bj/
 
-#ignore thumbnails created by windows
-Thumbs.db
-#Ignore files build by Visual Studio
-*.obj
+# mstest test results
+TestResults
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
 *.user
-*.aps
-*.pch
-*.vspscc
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+x64/
 *_i.c
 *_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.cache
 *.ilk
-*.log
-[Bb]in
-[Dd]ebug*/
-[Rr]elease]*/
-*.lib
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
 *.sbr
-*.nzb
-obj/
-_ReSharper*/
-[Tt]est
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.log
+*.vspscc
+*.vssscc
+.builds
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
 [Rr]esult[s]
-[Nn]zbs
-[Bb]uild/
-[Ll]ogs/
-[Aa]pp_Data/
-packages/
-/FakesAssemblies/
-#NZBDrone specific
-*.db
-*Web.Publish.xml
-NzbDrone.Web/NzbDrone.Web.Publish.xml
 *.sdf
-[Bb]anners
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Mindbench SASS cache
+.sass-cache/
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Publish Web Output
+*.Publish.xml
+
+# NuGet Packages Directory
+packages
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql
+TestResults
+[Tt]est[Rr]esult*
+*.Cache
+ClientBin
+[Ss]tyle[Cc]op.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# Git Files
 *.orig
-_rawPackage/
-NzbDrone.zip
-NzbDrone.sln.DotSettings.user*
-config.xml
-UpdateLogs/
-NzbDrone.Web/MediaCover
-NzbDrone.fpr
-nzbdrone.log*txt
-_rawPackage_service/
+
+# Tools
 _NCrunch_*
 _TeamCity*
-NCrunch_*
+
+# NzbDrone
+config.xml
+nzbdrone.log*txt
+NzbDrone.Web/MediaCover
+UpdateLogs/