Start of videoView
Merge branch 'master' of https://github.com/InePetrine/Subsea-git

Conflicts:
	Subsea/AndroidManifest.xml
	Subsea/bin/AndroidManifest.xml
	Subsea/bin/Subsea.apk
	Subsea/bin/classes.dex
	Subsea/bin/classes/com/statoil/subsea_introduction/DocumentAdapter.class
	Subsea/bin/classes/com/statoil/subsea_introduction/MainActivity.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$drawable.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$id.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$layout.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$menu.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$string.class
	Subsea/bin/classes/com/statoil/subsea_introduction/SectionFragment.class
	Subsea/bin/classes/com/statoil/subsea_introduction/gallery/ActivityFullscreenImage.class
	Subsea/bin/classes/com/statoil/subsea_introduction/gallery/FragmentFullscreenImage.class
	Subsea/bin/classes/com/statoil/subsea_introduction/gallery/GalleryImageAdapter.class
	Subsea/bin/resources.ap_
	Subsea/gen/com/statoil/subsea_introduction/R.java
	Subsea/res/values/strings.xml