refactor
Merge branch 'master' of github.com:fhinkel/TweetOptimizer

Conflicts:
	python/relation_calculator.pyc
	server/src/interfaceToPython.js
fix texts