Merge pull request #3018 from WebsiteDeveloper/PreferencesIDCleanup

Preferences id cleanup
Fix for #3095 (German translation)
Merge pull request #3055 from adobe/iwehrman/disable-javascript-hinting-in-html

Only provide JS hints for JavaScript files
Provide editor options "line numbers", "active line" and "word wrap" as new menu items under View menu.
Merge pull request #3079 from adobe/alf

ALF Automation
Merge pull request #3067 from adobe/nj/issue-3038

Remove Connect favicon--just use user's (or none)
Merge pull request #3078 from adobe/randy/fix-live-dev-ut

Fix Live Development integration test
Merge pull request #3096 from msiemens/issue-3095

Fix for #3095 (German translation)
Merge pull request #2996 from antonellopasella/master

Updated italian translation
Provide editor options "line numbers", "active line" and "word wrap" as new menu items under View menu.
Merge branch 'rlim/word-wrap' of https://github.com/adobe/brackets into rlim/word-wrap
Use \u2026 escape char
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Merge pull request #3020 from WebsiteDeveloper/issue-2645

Added Localisation for the Loading... message
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Merge branch 'rlim/word-wrap' of https://github.com/adobe/brackets into rlim/word-wrap
Merge pull request #3058 from lkcampbell/fix-issue-2078

Fix issue 2078
Changed check
Merge pull request #3081 from WebsiteDeveloper/Issue-3032

Fixed: #3032 KeyBindingManager no longer warns / prevents binding collisions
revert removal of jshint boss flag, see #2957