Android manifest changes
Database Provider
Successful merge of Nitesh and Bagga's changes