Functional shipping view
Basic collection view for albums
merging project.pbxproj
more template chagnes
added templates
added templates view
added templates views
resolving changes