Partial commit for fixing capture_activity.
Merge branch 'master' of https://github.com/SamPortnow/Depression_Prevention_Program
Temporary commit; CaptureActivity is broken because Negative/Positive
thoughts are getting 0 sizes.
Temporary fix for thoughts not showing.
Fixed up more issues for thoughts not showing. Adding in instructions to
show when necessary.
Renamed ThoughtsDS and ThoughtsHelper to Bato: as it will now encompass
points history.
Renamed all Scales -> Capture.
Use a private ThoughtDao as we will reference it later when creating a
challenging thought.
Merge remote-tracking branch 'origin/master' into capture_fixes
Merge remote-tracking branch 'origin/capture_fixes'

Conflicts:
	bato/AndroidManifest.xml
	bato/res/values/strings.xml
	bato/src/com/samportnow/bato/addthought/AddEventActivity.java
	bato/src/com/samportnow/bato/addthought/AddEventUserCategoryFragment.java
	bato/src/com/samportnow/bato/capture/BattleField.java
	bato/src/com/samportnow/bato/capture/CaptureActivity.java
	bato/src/com/samportnow/bato/database/ThoughtsDataSource.java
Added getRandomThought() to BatoDataSource. Fixed references to this.