search function added
In progress: adding functions handling friend adding on server.
Merge branch 'develop' of https://github.com/alekgajos/Jamii into merge2

Conflicts:
	src/server.js
	src/srv/http/css/style-app.css
	src/srv/http/js/rest.js
fix getUserDataFromId
Merge branch 'merge2' of https://github.com/Folwarski/Jamii into mergeMF
Functions to add friend on server.
js add
merged with friends
fixed searching