Signed-off-by: Carevel <caochj@gmail.com>
Merge branch 'master' of github.com:Carevel/BigDogShop

Conflicts:
	BigDogShop.Web/Admin/Styles/Base.css
	BigDogShop.Web/Admin/Users/List.aspx
	BigDogShop.Web/App_Data/BigDogShopDB.mdf
	BigDogShop.Web/App_Data/BigDogShopDB_log.ldf

Signed-off-by: Carevel <caochj@gmail.com>
Signed-off-by: Carevel <caochj@gmail.com>