Merge branch 'master' of https://github.com/e0725675/wmpmss14_g8

Conflicts:
	sentimentanalyzer/src/main/resources/TwitterContext.xml
Merge branch 'master' of https://github.com/e0725675/wmpmss14_g8