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

Conflicts:
	HLP.Wcf.Entries/wcf_Funcionario.svc.cs
	View/WPF/HLP.Entries.View.WPF/Gerais/WinCalendario.xaml
Merge branch 'master' of https://github.com/dramosti/Magnificus2014