Merge branch 'master' into develop
Changeing the results to show as a table
Merge branch 'develop'