Still legal
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shafam.UserInterface/Shafam.UserInterface.csproj
Merge branch 'master' of https://github.com/alikaraki/Shafam

Conflicts:
	Shafam.UserInterface/Controllers/FinanceController.cs
	Shafam.UserInterface/Controllers/LegalController.cs