pagin
Merge branch 'daily/1.0.3' of github.com:billyang123/notes into daily/1.0.3

Conflicts:
	application/config/database.php