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

Conflicts:
	Comum/HLP.Comum.Resources/Styles/mainStyle.xaml
	HLP.Sales.ViewModel/Commands/Comercio/OrcamentoCommands.cs
	View/WPF/HLP.Magnificus.View.WPF/MainWindow.xaml