server merge

Merge branch 'dev' into marissa
merge
merge own commit Merge branch 'dev' into marissa
merge
did some stuff
Merge pull request #38 from Swap-Meet/karldev

search functionality when logged in - early stages of adding to favorites
Add angular Tabs for the Profile page
Update Tabs
Merge pull request #39 from Swap-Meet/addProfileTabs

Add profile tabs
merge
merge
Merge pull request #40 from Swap-Meet/offer

Offer
adding to favs from search works and moved signout to footer
fixed conflicts from latest dev pull
profile
Merge pull request #41 from Swap-Meet/profile

profile
Merge branch 'dev' into karldev
fixed dependency error in nav ctrl
color change
merge conflicts fix