Added conflict handling mechanism! It works now :) Notifications will be
raised on conflict.
AppoinText
Merge iWhateverbranch 'master' of https://github.com/CodeGood/AppoinText

Conflicts:
	AndroidManifest.xml
Got my Activity back
Ready to push ConflictDetection from backend.