added mockup-slides
Merge branch 'master' into angularui
Replace express deprecated method res.json(status, obj)
with res.status(status).json(obj)
Fix method name
added some mockup
some mockup-changes
some mockup-changes
Fix deprecation warnings, part 1
Move doc folder to Dropbox https://db.tt/cTT3BYTW
Merge branch 'master' of github.com:fh-koeln/LevelPad

Conflicts:
	doc/LevelPad Mockups.key/Index.zip
	doc/LevelPad Mockups.key/Metadata/Properties.plist
Switch users/me and users/:username route
Fix deprecation warnings, part 2
Merge branch 'master' of github.com:fh-koeln/LevelPad
Update, update, udpdate
Merge branch 'master' of github.com:fh-koeln/LevelPad
Veranstaltung Layout Anpassung
Windows npm run-script run, run-auto, test, funktioniert wieder. test-cov noch nicht
Fehler mit test-cov unter Windows behoben.
Merge branch 'master' into angularui