project UPDATE
Merge branch 'master' of https://github.com/Infobank-intern/QuizOnText

Conflicts:
	baseballtext/AndroidManifest.xml
	baseballtext/src/net/ib/baseballtext/view/TextPollingView.java