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

Conflicts:
	ViewModel/HLP.Entries.ViewModel/app.config