#3 seems fixed for me now.
Merge branch 'file_sync' of
https://github.com/smartcampuslab/smartcampus.vas.experiencebuster.android.git
into file_sync

Conflicts:
	src/eu/trentorise/smartcampus/eb/custom/capture/ContentRenderer.java