Merge branch 'master' into develop
Adjusted namespaces and renamed some copy-pasted code
Fixed assembly info and ripple config
Merge branch 'develop'