data update
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	sql/data.sql
after merge conflicts resolution