enabled settings button
Merge branch 'dev' into feature/ios7layout