network refreshing when new settings are loaded, added settings.xml to repo
Merge remote-tracking branch 'origin/master'

rame

Conflicts:
	src/gFrameApp.cpp