Merge branch 'master' of https://github.com/89031007131/smeta

Conflicts:
	application/classes/Controller/Budget.php
	media/js/budget_page/budget.js