removing blank lines
right settings page, but wont register
Merge branch 'master' into dev