Merge pull request #40 from dmitryyankovich/master

navbar fix, nesting admincontroller from base
fixed bugs with wishlists
add friends to wishlist fixed
Merge branch 'develop'