tabbar items
Merge branch 'tabbar' into develop
added pin callouts
Merge branch 'pins' into develop
clean up / formatting changes.
Merge pull request #1 from pouriaalmassi/develop

Develop