Added preliminary models based on EER. Changed db settings to connect to MySql database on localhost:3306.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml