archive blank rows removed
critical word removed
critical word removed from all layouts
bug fixed
Merge branch 'notification'

Conflicts:
	AndroidManifest.xml