conflict resolve
merge
merge
merge
Merge branch 'webview' of https://github.com/hasan75/sporsho into webview

Conflicts:
	src/Sporsho/UserBundle/Controller/DashboardController.php
	src/Sporsho/UserBundle/Resources/views/Dashboard/paymentByMember.html.twig
add category,items daily cost entity
add category,items daily cost entity