db only
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/data/editor.lck
	db/data/editor.log
	db/data/editor.properties
	db/data/editor.script
new personal article views