Add ColumnName and TableName annotations
Use TableName for getting table name
Merge branch 'master' into custom-name
Merge branch 'master' into custom-name
use ColumnName annotation when getting name for table column
Clear imports
Merge branch 'custom-name'