fixes erroneous borrower menu link inserts
Merge branch 'translation-labels'

Conflicts:
	app/Zidisha/Lender/GiftCardService.php
	app/Zidisha/Lender/LenderService.php
	app/controllers/BorrowerJoinController.php
	app/controllers/CommentsController.php
	app/controllers/LenderController.php
	app/controllers/LenderInviteController.php
	app/controllers/LenderJoinController.php
	app/views/admin/borrower-activation/feedback.blade.php
	app/views/lender/loans.blade.php
	app/views/pages/faq.blade.php
	app/views/partials/comments/comments.blade.php
	app/views/partials/comments/partial/comment-actions.blade.php
	app/views/partials/comments/partial/delete.blade.php
	app/views/partials/comments/partial/display-uploads.blade.php
	app/views/partials/comments/partial/edit.blade.php
	app/views/partials/comments/partial/post.blade.php
	app/views/partials/comments/partial/reply.blade.php
	app/views/partials/comments/partial/translate.blade.php