search
fixed conflicts
advanced search on storyDB
Merge branch 'master' of https://github.com/Jaaga/videovol

Conflicts:
	model/StoryDB.php
	public/index.php