video Instruction feature added
Added Settings to the android manifest
Merging location tracking with master: Chaitali, Sruthi
enabling based on notification