Merge pull request #918 from jon-stumpf/enhancement-eliminate-hardcoded-protocol-names

Eliminate hardcoded protocol names
Put back cache timeout (fix #933)
Merge branch 'master' of github.com:tananaev/traccar into protocol-esky-610