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

Conflicts:
	WhatAreYouDoingPlanner/res/layout/overlay_help.xml
	WhatAreYouDoingPlanner/src/com/cryinrabbit/whatareyoudoingplanner/WaydFragment.java
Merge branch 'master' of https://github.com/CryinRabbit/WAYD