Merge branch '5-mysql-reserved-word-as-column-name' into 'develop'

added anotation for the column name in order to avoid mysql syntax errors

See merge request !3