code formatting
close #2 (source from sheinin)
comment fixed
Code reformatted according conventions, table comments added
update to current db state
Merge remote-tracking branch 'upstream/master'