modify config bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Application/Home/Controller/IndexController.class.php
	Application/Home/Model/NoteModel.class.php
modify config bug