ignore
Merge pull request #1 from zcht/master

update from master
tidy up admin setting form
decalre false to avoid problems of $title not declared
Merge pull request #2 from shibuya246/master

tidy up admin settings