working on ui views
commit switching different branch
cannot get child staste to work
 working child statefor collection
merge complete / both collection and album is working
fixed ui-sref for navbar
fixed merge conflict