XML diagram updated

Signed-off-by: Julia <julia.altenbuchner.11@ucl.ac.uk>
Merge branch 'master' of https://github.com/ExCiteS/Sapelli
XML diagram fixed
Improved Bitmap handling on Photo previews that may caused OutOfMemoryError exceptions in some devices

Signed-off-by: Michalis Vitos <info@michalisvitos.gr>
Merge branch 'master' of github.com:ExCiteS/Sapelli
Better Bitmap handling on FileImageItems that could cause OutOfMemoryError exceptions

Signed-off-by: Michalis Vitos <info@michalisvitos.gr>
Fixed two shortcuts bug on the Android Home Launcher

Signed-off-by: Michalis Vitos <info@michalisvitos.gr>
VirtualColumn related features for Julia

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Merge branch 'master' into lib2x+

Conflicts:
	Library/src/uk/ac/ucl/excites/sapelli/collector/model/fields/ChoiceField.java
Progess on SQL(ite) storage

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>