k

k
k
k
deleted
Merge remote-tracking branch 'origin/master'

Conflicts:
	Barroc/Barroc.v12.suo
	Barroc/Barroc/Barroc-IT.mdf
	Barroc/Barroc/Barroc-IT_log.ldf
	Barroc/Barroc/Barroc.csproj
	Barroc/Barroc/Development.Designer.cs
	Barroc/Barroc/Development.cs
	Barroc/Barroc/Project.Designer.cs
	Barroc/Barroc/bin/Debug/Barroc-IT.mdf
	Barroc/Barroc/bin/Debug/Barroc-IT_log.ldf
	Barroc/Barroc/bin/Debug/Barroc.exe
	Barroc/Barroc/bin/Debug/Barroc.pdb
	Barroc/Barroc/obj/Debug/Barroc.csproj.FileListAbsolute.txt
	Barroc/Barroc/obj/Debug/Barroc.csproj.GenerateResource.Cache
	Barroc/Barroc/obj/Debug/Barroc.exe
	Barroc/Barroc/obj/Debug/Barroc.pdb
	Barroc/Barroc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache