more design
Merge branch 'master' of https://github.com/alexBeuth/whatsToDo.git

Conflicts:
	WhatsToDo/AndroidManifest.xml
	WhatsToDo/src/com/whatstodo/utils/AlarmService.java
Merge branch 'master' of local repository into synchronization

Conflicts:
	WhatsToDo/AndroidManifest.xml