Change the Camera action button to SubMenu, which has two menuItem.
Merge branch 'master' of https://github.com/CryinRabbit/WAYD

Conflicts:
	Wayd/WhatAreYouDoingPlanner/bin/WhatAreYouDoingPlanner.apk
	Wayd/WhatAreYouDoingPlanner/bin/classes.dex
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$id.class
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$layout.class
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$menu.class
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$string.class
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$style.class
	Wayd/WhatAreYouDoingPlanner/bin/dexedLibs/android-support-v4-5f0c9e9cc1c9f66333ac95fed51f9129.jar
	Wayd/WhatAreYouDoingPlanner/bin/dexedLibs/android-support-v4-a84179449ef9a33f74939c37b8522704.jar
	Wayd/WhatAreYouDoingPlanner/bin/dexedLibs/android-support-v4-fd0fe9befb947560f9a6ed50819a6400.jar
	Wayd/WhatAreYouDoingPlanner/bin/resources.ap_
	Wayd/WhatAreYouDoingPlanner/gen/com/cryinrabbit/whatareyoudoingplanner/R.java
	Wayd/WhatAreYouDoingPlanner/res/menu/wayd.xml
	Wayd/WhatAreYouDoingPlanner/res/values/strings.xml
	Wayd/WhatAreYouDoingPlanner/src/com/cryinrabbit/whatareyoudoingplanner/WaydFragment.java