Merge branch 'develop'
Merge branch 'master' into develop
Added horizontal layout, logging, question indexing