Twitter values added
Merge branch 'master' of https://github.com/PROMAND/WhistlingPandas.git

Conflicts:
	res/values/strings.xml