FileSharing 1.0.3
Merge remote-tracking branch 'origin/master'

Conflicts:
	ICT4Events Project/ICT4Events Project.v12.suo
	ICT4Events Project/ICT4Events Project/DatabaseManager.cs
	ICT4Events Project/ICT4Events Project/bin/Debug/ICT4Events Project.exe
	ICT4Events Project/ICT4Events Project/bin/Debug/ICT4Events Project.pdb
	ICT4Events Project/ICT4Events Project/obj/Debug/ICT4Events
Project.csproj.GenerateResource.Cache
	ICT4Events Project/ICT4Events Project/obj/Debug/ICT4Events
Project.csprojResolveAssemblyReference.cache
	ICT4Events Project/ICT4Events Project/obj/Debug/ICT4Events Project.exe
	ICT4Events Project/ICT4Events Project/obj/Debug/ICT4Events Project.pdb