db pass local
Merge branch 'master' into tcmgps
pass tcm
ignore database.php
CLOSED - task 103: Dashboard Block 
http://github.com/antareja/surabi/issues/issue/103
Merge branch 'master' into tcmgps

Conflicts:
	application/config/database.php
ignore qrcode
delete ignore
creat test call base_url_new