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