Adding a friend requested field so that we can
track who sent the friend request.
Revert "Replacing Notification with FriendRequest."
Changed my mind, reverting back to Notification.
This reverts commit 71bc86dfe0e635c1a73cccc070ef9bc7a8532afa.

Conflicts:
	src/Wishlist/CoreBundle/Entity/WishlistUser.php
	src/Wishlist/CoreBundle/Repository/FriendRequestRepository.php
	src/Wishlist/UserBundle/Controller/DefaultController.php
Revert "Renaming Notification.orm.yml to FriendRequest.orm.yml."
Changed mind again, going back to Notification.
This reverts commit 52c3d8009b1a495e0d0199c9a8583a32eece78b9.
Finishing the revert.
Lingering issues from renaming.
Stop in error in refresh.sh
one more lingering bug.
Fixing exception if user has no friends.
Committing some more changes that I made to the navigation bar.
Merge branch 'addFriends' of github.com:DannyMardini/wishlist into addFriends

Conflicts:
	web/css/navBar.css