sdgfsd
Merge branch 'master' of github.com:evkap/hcktn

Conflicts:
	Hackaton.ServerSide/CustomBaseLibrary/CustomBaseLibrary.csproj
	Hackaton.ServerSide/CustomBaseLibrary/DataAccess/HelpDeskDataAccess.cs
	Hackaton.ServerSide/MVCForum.Website/App_Data/LogFile.txt