fast site and other changes
Merging with android changes
Merge branch 'master' of https://github.com/saran87/RealTimePackageMonitoringandTracking