Merge pull request #23 from Mayho/dev

Merge Mehul's dev branch
Merge branch 'dev' of github.com:Blazur/blazur into dev
refactor(settings.js): cleanup comments