test master merge
test
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
refined MarkNote, lot of changes
remove junk
ignore swp
Merge branch 'refine'
copy feature
Merge commit '1637ed'

Conflicts:
	dbset.py
	editpart.py
some flaws
Merge branch 'master' of https://github.com/cfgchouhang/MarkNote

Conflicts:
	templates/index.html
fix conflicts
edit and update feature
fixed bugs and changed test output
    fixed bugs when adding blank tags.
    test output db's data to file instead of terminal
remove editpart, fix wrong url in load html