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

Conflicts:
	HLP.Wcf.Entries/HLP.Wcf.Entries.csproj
A
Merge branch 'master' of https://github.com/dramosti/Magnificus2014