updated app icon
separating launcher and actionbar icons
Merge branch 'master' into pro-2.3
using correct actionbar icon
refactored shared settings to application class
after refactoring merge
updated for 2.3.1
updated 2.3.1 assets
Merge branch 'master' into pro-2.3