-- latest changes
Merge branch 'master' of https://github.com/bhaskarraju/dollarteam

Conflicts:
	application/controllers/accounts.php
	application/models/accounts_model.php