Merge branch 'dev'

* dev:
  only show activities of bidirectional friends (fixes #95)
  badges support (fixes #114)
activities examples added for jekyll
activity example added for jekyll
activities md updated
activities md updated
Merge branch 'dev' of https://github.com/enviroCar/enviroCar-server into dev

* 'dev' of https://github.com/enviroCar/enviroCar-server:
  activities md updated
  activities md updated
  activity example added for jekyll
  activities examples added for jekyll
clean up of API docs
phenomenon and activities added
activity jekyll example
changed name in activtiy jekyll example
sensors jekyll example added
updated examples
Merge branch 'dev' of https://github.com/enviroCar/enviroCar-server into dev

* 'dev' of https://github.com/enviroCar/enviroCar-server:
  sensors jekyll example added
  changed name in activtiy jekyll example
  activity jekyll example
  phenomenon and activities added

Conflicts:
	docs/_examples/activities.json
sensors shotened
Merge branch 'dev' of https://github.com/enviroCar/enviroCar-server.git
into dev
root resource and example added for jekyll
root example
documentation finished Closes #43
Merge branch 'dev'

* dev:
  documentation finished Closes #43
  root example
  root resource and example added for jekyll
  sensors shotened
  updated examples
  sensors jekyll example added
  changed name in activtiy jekyll example
  activity jekyll example
  phenomenon and activities added
  clean up of API docs
  pagination documentation
  activities md updated
  activities md updated
  activity example added for jekyll
  activities examples added for jekyll
statistics examples