Settings update#37

Open

Almoped wants to merge 6 commits intotheblixguy:masterfrom

Almoped:settings-update

Commits on Aug 24, 2016

Commits on Aug 25, 2016

Commits on Feb 26, 2017

Merge branch 'master' into settings-update
Almoped
authored