Merge branch 'master' into dev
fix libs import mistakes
fix import libs mistakes
add settings action bar
add DisplayMessageActivity
merge with dev
add listviews
fix conficts
add readme