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

Conflicts:
	View/WPF/HLP.Magnificus.View.WPF/App.config
	ViewModel/HLP.Entries.ViewModel/HLP.Entries.ViewModel.csproj
	ViewModel/HLP.Entries.ViewModel/app.config