Navigation drawer; Video gallery layout; Database
Merge branch 'master' of https://github.com/InePetrine/Subsea-git

Conflicts:
	Subsea/bin/Subsea.apk
	Subsea/bin/classes.dex
	Subsea/bin/classes/com/statoil/subsea_introduction/FieldActivity.class
	Subsea/bin/classes/com/statoil/subsea_introduction/MainActivity$1.class
	Subsea/bin/classes/com/statoil/subsea_introduction/MainActivity.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$color.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$dimen.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/R$style.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R$styleable.class
	Subsea/bin/classes/com/statoil/subsea_introduction/R.class
	Subsea/bin/classes/com/statoil/subsea_introduction/SectionFragment$1.class
	Subsea/bin/classes/com/statoil/subsea_introduction/SectionFragment.class
	Subsea/bin/classes/com/statoil/subsea_introduction/SectionsPagerAdapter.class
	Subsea/bin/classes/com/statoil/subsea_introduction/documents/ActivityWebViewer.class
	Subsea/bin/classes/com/statoil/subsea_introduction/documents/DocumentAdapter.class
	Subsea/bin/classes/com/statoil/subsea_introduction/documents/DocumentClickListener.class
	Subsea/bin/classes/com/statoil/subsea_introduction/documents/DownloadFileFromURL.class
	Subsea/bin/classes/com/statoil/subsea_introduction/fullscreenImage/ActivityFullscreenImage.class
	Subsea/bin/classes/com/statoil/subsea_introduction/fullscreenImage/FragmentFullscreenImage.class
	Subsea/bin/classes/com/statoil/subsea_introduction/gallery/GalleryImageAdapter.class
	Subsea/bin/classes/com/statoil/subsea_introduction/gallery/ImageClickListener.class
	Subsea/bin/classes/com/statoil/subsea_introduction/video/VideoActivity$1.class
	Subsea/bin/classes/com/statoil/subsea_introduction/video/VideoActivity$2.class
	Subsea/bin/classes/com/statoil/subsea_introduction/video/VideoActivity.class
	Subsea/bin/classes/com/statoil/subsea_introduction/video/VideoListAdapter.class
	Subsea/bin/classes/com/statoil/subsea_introduction/views/ButtonClickListener.class
	Subsea/bin/classes/com/statoil/subsea_introduction/views/ImageGalleryCategoryView.class
	Subsea/bin/dexedLibs/android-support-v4-4f6a62a457e2f47676f937c702c6c3f2.jar
	Subsea/bin/dexedLibs/jtds-1.3.1-a5a79b793258dd9bb237b5b2894a4813.jar
	Subsea/bin/resources.ap_
	Subsea/gen/com/statoil/subsea_introduction/R.java
	Subsea/res/layout/activity_main.xml
	Subsea/res/layout/list_item_drawer.xml
	Subsea/res/layout/list_item_video.xml
	Subsea/src/com/statoil/subsea_introduction/MainActivity.java