friend requests working
Merge branch 'master' of https://github.com/NicoECvK/dashgumfree_v2

Conflicts:
	Theme/friends_page1.html