Merge branch 'develop' of github.com:tigeraven/brave into develop
Merge branch 'master' into develop
Changed develop config settings