added ripple.config
Merge branch 'master' into develop

Conflicts:
	ripple.config