fixed bug where loading so many points from the db would fill up memory and cause the service to stop
updated version info
re ohmage/ohmageAndroidLib#7. removed displayType
re ohmage/ohmageAndroidLib#7. removed removed summary.
re ohmage/ohmageAndroidLib#7. removed abbreviatedText
fixed #432. All prompts now can be compared to SKIPPED or NOT_DISPLAYED
fixed bug where survey would crash if condition checked prompt which was skipped
update version number for release
increased the version number because the last version was not built correctly
fixed bug where campaign urn and created timestamp were accidentally switched
fixed bug where times of responses would adjust to the timezone
timestamp timezone usage of ISO8601 throughout the app with jodatime
the timestamp prompt now uses joda time to format its value
updated version for release
Merge branch '2.14' into mobilize

Conflicts:
	AndroidManifest.xml
	src/org/ohmage/prompt/singlechoice/SingleChoicePrompt.java
	src/org/ohmage/prompt/timestamp/TimestampPrompt.java