Prepare story-tag-search
Merge remote-tracking branch 'origin/develop' into SpeechRecognition

Conflicts:
	app/app.iml
Added search for story-elements by tag