To fix minor bugs -2
Merge WHateverbranch 'master' of https://github.com/CodeGood/AppoinText

Conflicts:
	src/com/appointext/database/DatabaseManager.java
To fix the bug of cancel reminders