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

Conflicts:
	View/WPF/HLP.Entries.View.WPF/RecursosHumanos/WinEspelhoPonto.xaml
ponto
Merge branch 'master' of https://github.com/dramosti/Magnificus2014
a
Merge branch 'master' of https://github.com/dramosti/Magnificus2014