Merge branch 'development'
Changed settings view to a table view