Updated sql db
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Functional categories implemented
Functional categories implemented