Merge remote-tracking branch 'origin/master'

# Conflicts:
#	VSeesResourceWeb/urls.py
#	background/views.py

VSeesResourceWeb/urls.py

@@ -21,6 +21,7 @@ from background.views import ProductInfoSet, VideoInfoSet, QuickStartInfoSet, Up
 
 router = routers.DefaultRouter()
 router.register(r'productInfo', ProductInfoSet)
+router.register(r'productInfo', ProductInfoSet)
 router.register(r'videoInfo', VideoInfoSet)
 router.register(r'quickStartInfo', QuickStartInfoSet)
 router.register(r'upgradeFirmwareInfo', UpgradeFirmwareInfoSet)