Added reachability api to check if device is using 3g or wifi. Implemented upload according to user's preferences
Fixed merge conflicts
Fixed merge conflicts