EDIT: 'tour/index' to have a better desing
Merge branch 'develop'
EDIT: Fixed minor merge-based errors
EDIT: Fixed minor merge-based errors