Largeish commit. Take a look around and try to understand how things are going. Some code taken from my own project named Inter.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/settings.yml.example