drr
Merge branch 'master' of https://github.com/dramosti/HLP.Controls

Conflicts:
	HLP.Controls.v12.suo
drr
Merge branch 'master' of https://github.com/dramosti/HLP.Controls

Conflicts:
	HLP.Controls.Wcf/bin/HLP.Controls.Wcf.pdb
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.csproj.FileListAbsolute.txt
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.csprojResolveAssemblyReference.cache
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.pdb
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.pdb
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.csproj.GenerateResource.Cache
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.csprojResolveAssemblyReference.cache
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.v12.suo
	HLP.Controls/bin/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls.csproj.FileListAbsolute.txt
	HLP.Controls/obj/Debug/HLP.Controls.csproj.GenerateResource.Cache
	HLP.Controls/obj/Debug/HLP.Controls.g.resources
	HLP.Controls/obj/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.cache
	HLP.Controls/obj/Debug/Resources/Styles/UserControlStyles.baml
	HLP.Controls/obj/Debug/ViewWindow/wdQuickSearch.baml
	HLP.Controls/obj/Release/Component/FindFile.g.cs
drr
Merge branch 'master' of https://github.com/dramosti/HLP.Controls

Conflicts:
	HLP.Controls.Wcf/bin/HLP.Controls.Wcf.pdb
	HLP.Controls.Wcf/bin/HLP.Controls.pdb
	HLP.Controls.Wcf/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.csprojResolveAssemblyReference.cache
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.pdb
	HLP.Controls.WindowTeste/MainWindow.xaml
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.pdb
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.csprojResolveAssemblyReference.cache
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.g.resources
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.baml
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.g.cs
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.g.i.cs
	HLP.Controls.v12.suo
	HLP.Controls/HLP.Controls.csproj
	HLP.Controls/bin/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/Component/Find.g.i.cs
	HLP.Controls/obj/Debug/Component/FindFile.g.cs
	HLP.Controls/obj/Debug/HLP.Controls.g.resources
	HLP.Controls/obj/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.cache
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.cache
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.lref
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.lref
	HLP.Controls/obj/Debug/Resources/Styles/UserControlStyles.baml
	HLP.Controls/obj/Release/ViewWindow_/wdQuickSearch.g.cs
drr
Merge branch 'master' of https://github.com/dramosti/HLP.Controls

Conflicts:
	HLP.Controls.Wcf/bin/HLP.Controls.Wcf.pdb
	HLP.Controls.Wcf/bin/HLP.Controls.pdb
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.csprojResolveAssemblyReference.cache
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.pdb
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.pdb
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.csproj.GenerateResource.Cache
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.csprojResolveAssemblyReference.cache
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.v12.suo
	HLP.Controls/bin/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls.csproj.GenerateResource.Cache
	HLP.Controls/obj/Debug/HLP.Controls.csprojResolveAssemblyReference.cache
	HLP.Controls/obj/Debug/HLP.Controls.pdb