Merge branch 'develop' into feature/backend
Add more searching to search
Charts now returned in random order to make more interesting
Merge branch 'feature/frontend' into develop