Cleaned up files
Improved content searching
Merge branch 'develop'