align text
new version of database, default data
Merge remote-tracking branch 'origin/master'