camerafragment populated
Added a temporary listview in the history.
test array toegevoegd om een lijst te creeeren voor de history
code getest van vogella. Camera opent daadwerkelijk in de juiste
fragment
camera fullscreen in fragment gefixt
About page helemaal klaar.
overlay werkend. Is alleen persistent over alle fragments. Methode om de
overlay te verwijderen of onzichtbaar te maken werkt niet, moet nog
worden aangepast.
niet werkende versie met switch case & viewswitcher
zoeker verwijderd. Was niet werkend te krijgen.
Merge branch 'Develop' of https://github.com/rickvi1/colorTaste.git into
CameraFeature

Conflicts:
	ColorTaste/bin/ColorTaste.apk
	ColorTaste/bin/classes.dex
	ColorTaste/bin/classes/com/stenden/colortaste/AboutFragment.class
	ColorTaste/bin/classes/com/stenden/colortaste/HistoryFragment.class
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity$1.class
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity$2$1.class
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity$2.class
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$drawable.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$id.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$layout.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$menu.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$string.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$style.class
	ColorTaste/bin/classes/com/stenden/colortaste/SettingsFragment.class
	ColorTaste/bin/resources.ap_
	ColorTaste/gen/com/stenden/colortaste/R.java
	ColorTaste/res/layout/fragment_history.xml
	ColorTaste/src/com/stenden/colortaste/HistoryFragment.java
	ColorTaste/src/com/stenden/colortaste/MainActivity.java
	ColorTaste/src/com/stenden/colortaste/SettingsFragment.java
Merge branch 'hexToString' into Develop

Conflicts:
	ColorTaste/bin/ColorTaste.apk
	ColorTaste/bin/classes.dex
	ColorTaste/bin/classes/com/stenden/colortaste/HistoryFragment.class
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$drawable.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$id.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$layout.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$menu.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$string.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$style.class
	ColorTaste/bin/classes/com/stenden/colortaste/TestFragment.class
	ColorTaste/bin/resources.ap_
	ColorTaste/gen/com/stenden/colortaste/R.java
	ColorTaste/res/layout/fragment_history.xml
	ColorTaste/src/com/stenden/colortaste/HistoryFragment.java