Merge remote-tracking branch 'origin/master'

Conflicts:
	RequirementsTranslator.py
	UpdateWordList.py
	projectproposal.json

deleted files + search changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	RequirementsTranslator.py
	UpdateWordList.py
	Web app/app/sentimentAnalysis.py
	projectproposal.json