Add contents path bar to @@contents view.
Rename requirement to real package names.
Merge pull request #204 from j23d/master

Add contents path bar to @@contents view.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Rename requirement to real package names.
Upgrade requirements.
Merge remote-tracking branch 'origin/master' into feature/content_upload

# By Andreas Kaiser (2) and Marco Scheidhuber (1)
* origin/master:
  Upgrade requirements.
  Rename requirement to real package names.
  Add contents path bar to @@contents view.

Conflicts:
	requirements.txt