More line ending changes.

Signed-off-by: benelliott <bengelliott@gmail.com>
Still more line endings.

Signed-off-by: benelliott <bengelliott@gmail.com>
Updated Dependencies/aFileChooser project such that it matches the aFileChooser version which we use in mvn builds

Up to now Eclipse builds and mvn builds did not use the same fork/version of the aFileChooser library.
Mvn builds were using v2.4 of the aFileChooser fork by "krischik" (which we get from this maven repository: http://uiq3.sourceforge.net/Repository/com/ipaulpro/afilechooser-library/2.4).
Now the eclipse project has been updated to match that fork/version, using source code from https://github.com/krischik/aFileChooser/tree/2.4 (plus an additional jar, annotations-13.0.jar, which this fork/version of aFileChooser depends on).
Also update support library (android-support-v4.jar) to the latest version (21.0.1).

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Fixed potential/rare audio recording problem

I once saw this error appear in logcat: "mediarecorder went away with
unhandled events"
According to http://stackoverflow.com/a/11984387/1084488 this is easily
fixed by resetting the recorder between stopping and releasing it, so
that's what I added.
Merge branch 'master' into ben_audiofeedback

Conflicts:
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/activities/CollectorActivity.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/load/AndroidPostProcessor.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/AndroidControlsUI.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/CollectorView.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/FontFitTextView.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/fields/AndroidAudioUI.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/fields/AndroidChoiceUI.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/fields/AndroidMultiListUI.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/fields/AndroidPhotoUI.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/ui/items/TextItem.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/util/ProjectRunHelpers.java
	Dependencies/aFileChooser/build.xml
	Library/src/uk/ac/ucl/excites/sapelli/collector/control/Controller.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/io/FileStorageProvider.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/load/parse/FormParser.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/load/parse/ProjectParser.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/load/process/PostProcessor.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/load/process/TTSSynthesisTask.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/media/AbstractAudioFeedbackController.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/Field.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/Form.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/Project.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/AudioField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/ButtonField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/ChoiceField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/LabelField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/LocationField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/MediaField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/OrientationField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/UILessField.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/ui/CollectorUI.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/ui/fields/ChoiceUI.java
	Library/src/uk/ac/ucl/excites/sapelli/collector/ui/fields/FieldUI.java
	Library/src/uk/ac/ucl/excites/sapelli/shared/io/FileHelpers.java
	Library/src/uk/ac/ucl/excites/sapelli/shared/util/Parameters.java
Fixed bugs in height-sensitive FontFitTextView.