Minor changes
Merge branch 'master' of https://github.com/alikaraki/Shafam

Conflicts:
	Shafam.UserInterface/Controllers/FinanceController.cs
Conflict Resolved