Fix critical duplicate line bug in AndroidManifest.xml.
Reformat && Rearrange code. This is the final version. Team working should use same code style and reformat & rearrange before any commit.