initial comments implementation
initial comments implementation
fix wrong merge
Talks können kommentiert werden. Vorerst sind Kommentare statisch und unabhängig von talkId. Neu liefert ein UserService den aktuell eingeloggten User (auch gemockt)
Merge remote-tracking branch 'github/feature/STZE/comments' into feature/STZE/comments

Conflicts:
	app/api/comments.json
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/TrackController.js
	app/scripts/services/CommentService.js
	app/templates/comments-template.html
resolve merge conflicts
merged develop into feature/STZE/comments
Merge pull request #49 from SchweizerischeBundesbahnen/feature/STZE/comments

Feature/stze/comments