unknown changes
Merge branch 'master' of https://github.com/Foboy/FinancialSystem

Conflicts:
	.settings/org.eclipse.php.core.prefs
	application/config/urlconfig.php
	application/controllers/user.php