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

Conflicts:
	View/Silverlight/HLP.Magnificus.View.Web/HLP.Magnificus.View.Web/HLP.Magnificus.View.Web/Views/Ponto.xaml
Merge branch 'master' of https://github.com/dramosti/MagnificusWeb

Conflicts:
	View/Silverlight/HLP.Magnificus.View.Web/HLP.Magnificus.View.Web/HLP.Magnificus.View.Web/Views/Ponto.xaml