Merge remote-tracking branch 'origin/Bjodol' into Kristian
Starting of AnalyzeActivity v2
The imagepath is sent with the intent
Merge remote-tracking branch 'origin/Bjodol' into KristianNew

Conflicts:
	PlateMate/src/android/platemate/analyzer/AnalyzeActivity.java
	PlateMate/src/android/platemate/analyzer/Plate.java
	PlateMate/src/android/platemate/analyzer/Segmenter.java
QueryActivity for sprint 3
cameraactivity

committing since it is not possible to switch the branch
Revert of last commit on branch
Merge of master into branch
Layout and interaction
Fix of eglsurfaceattrib not implemented
Merge remote-tracking branch 'origin/master' into KristianNew

Conflicts:
	PlateMate/AndroidManifest.xml
	PlateMate/res/layout/activity_analyze.xml
	PlateMate/res/layout/welcomepage.xml
	PlateMate/res/values/strings.xml
	PlateMate/src/android/platemate/analyzer/AnalyzeActivity.java
	PlateMate/src/android/platemate/start/StartActivity.java
	PlateMate/src/android/platemate/storage/TemporaryStorage.java
Work work
work
Merge remote-tracking branch 'origin/KristianNew'

Conflicts:
	PlateMate/res/values/strings.xml
	PlateMate/src/android/platemate/camera/CameraActivity.java