Added settings
Merged online and offline

Conflicts:
	Settings-1_0.html