Fixed session expired filter bug
Merge branch 'master' of github.com:gmnarak/Puun

Conflicts:
	Puun.v11.suo
	Puun/Controllers/SettingController.cs
	Puun/Views/Shared/_LogOnPartial.cshtml
	Puun/bin/Puun.dll
	Puun/bin/Puun.pdb
	Puun/obj/Debug/Package/PackageTmp/Service References/ReportWS/ReportService.wsdl
	Puun/obj/Debug/Package/PackageTmp/Views/Announce/Index.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Report/BalanceSheet.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Report/CashFlow.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Report/ProfitLoss.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Report/_ViewImport.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Setting/Index.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Setting/Merchant.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Shared/Error.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Shared/_Layout.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/Shared/_LogOnPartial.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/User/Index.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/User/Search.cshtml
	Puun/obj/Debug/Package/PackageTmp/Views/User/_Users.cshtml
	Puun/obj/Debug/Package/PackageTmp/bin/Puun.dll
	Puun/obj/Debug/Package/PackageTmp/bin/Puun.pdb
	Puun/obj/Debug/Package/Puun.zip
	Puun/obj/Debug/Puun.csproj.FileListAbsolute.txt
	Puun/obj/Debug/Puun.csprojResolveAssemblyReference.cache
	Puun/obj/Debug/Puun.dll
	Puun/obj/Debug/Puun.pdb