ready to commit
Fix FC and adjust AndroidManifest.xml