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