Fixed a bug where the teacher client refused to run under HTTPS
oops
Merge pull request #123 from BSG-TUDelft/https_fix

Https fix
Removed bootstrap code and set hbm2ddl.auto=update
Merge branch 'master' of https://github.com/BSG-TUDelft/Utopolis
Merge branch 'configuration' of https://github.com/BSG-TUDelft/Utopolis into configuration
Added societal capital to resources
Game now reads configuration file for structure info
Resource generation will now take into account the number of assigned citizens. More citizens = more resources
Context menu shows the correct resource update interval time (10 seconds at this moment)
Societal capital is properly increased
Putting thin=true in the client URL initiates a special thin client mode where only one model is loaded
quest overview visual upgrade. Shows images
Merge pull request #128 from BSG-TUDelft/configuration

Merging.
Merge pull request #129 from BSG-TUDelft/questoverview

Merged!
Merge branch 'master' into premerge

Conflicts:
	client/main.js