Merge remote-tracking branch 'origin/master' into experimental

Conflicts:
	.gitignore
	.travis.yml
	README.md
	addons/sourcemod/scripting/freak_fortress_2.sp
	addons/sourcemod/scripting/freaks/default_abilities.sp
	addons/sourcemod/scripting/freaks/ff2_1st_set_abilities.sp
	addons/sourcemod/scripting/include/freak_fortress_2.inc
	addons/sourcemod/translations/freak_fortress_2.phrases.txt
	update.txt