Add settings page to admin area
Merge branch 'master' of gelbman:blop