Settings, trusted circle view controllers
Merge remote-tracking branch 'origin/master'
New UI changes