Merge pull request #1 from huangxinms/develop

为user表增加username列
Merge branch 'master' of https://github.com/huangxinms/leaftime
Merge remote-tracking branch 'origin/develop'
update .gitignore
add note model
add note model and template
Merge pull request #3 from liaofeng/note_model

note model