testing
Merge branch 'master' of https://github.com/CryinRabbit/WAYD

Conflicts:
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$layout.class.orig
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$menu.class.orig
	Wayd/WhatAreYouDoingPlanner/bin/classes/com/cryinrabbit/whatareyoudoingplanner/R$string.class.orig