updated string generation for adding custom tag on disaster page
Merge branch 'master' of https://github.com/mlidge/tweak-the-tweet

Conflicts:
	TweaktheTweet/res/values/strings.xml
	TweaktheTweet/src/uw/changecapstone/tweakthetweet/TestStringBuilderDisasterList.java