merge with master
refactore code in startactivity
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display
Add missing icon ic_saom.png