ff
15/04/14
Merge branch 'V1' of https://github.com/pomme190891/FinPlanWebStore into V1

Conflicts:
	FinPlanWeb/Controllers/AdminController.cs
	FinPlanWeb/Views/Admin/Dashboard.cshtml