Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Read battery level of BLE heart-rate monitor (when service available)
fixes for making releases from android studio
update eclipse references
Change localizable strings ID format to ease reusability and removed duplicates
Localizing the settings and hardcoded strings
replace hardcoded setTitle, setText, etc. texts
Added hard-coded string in strings.xml
Fix string access
Merge pull request #115 from fg1/hrm-battery-level

Read battery level of BLE heart-rate monitor (when service available)
Add battery level support to SamsungBLE, make AndroidBLE somewhat more resistant to failures
Move hrzones bar to notes tab
remove hardcoded strings for sports
fix missing ;
Add feature to prune deleted activities
replace hardcoded string with xml-string
Do not localize preference keys
Readd translations and fix some invalid pref keys
Remove duplicated strings and fix invalid localization folders name