a
Merge branch 'master' of https://github.com/dramosti/Magnificus2014
Merge branch 'master' of https://github.com/dramosti/Magnificus2014
a
Merge branch 'master' of https://github.com/dramosti/Magnificus2014

Conflicts:
	HLP.Entries.Services/HLP.Entries.Services.csproj
	HLP.Entries.Services/app.config