Added R.java.d files
Merged upstream master
Added check for trans_log.txt file
Merged upstream changes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Turned off manual lock when loading new sites file; Cleared operation in CurrentPosition model after confirm; Removed $.extend objects in Geolocation.js and ManualLock.js
removed alert when no trans log is found