Merge branch 'develop'
use asset catalog
remove unused icons
Merge branch 'master' into develop
import armv7s supported libber
fix: Shelf edit cell : text view alignments
refactor
update project settings, iOS5 etc.
remove icon bundle files