Fixed merge conflict. Moved permissions in manifest. Updated gradle.
Fixed merge conflict. Moved permissions in manifest. Updated gradle.

sudhirkhanger/StockHawk,ClarisseSan/StockHawk,sosegon/StockHawk,sosegon/StockHawk