Merge branch 'master' into develop
stop enter reloading new page on search result request
corrected a documentation glitch for checkToken - clarified which token is validated
Merge pull request #1318 from stephan48/develop

Corrected Documentation for checkToken() API Method
Load CSS before JS

According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
Load CSS before JS, in timeslider
Merge pull request #1327 from mluto/order-styles-script

Optimize the order of styles and scripts
fixed broken placeholders in locales
Fixed extractPadData.js, #1320
Added error-handling for npm
Merge pull request #1330 from mluto/fix-extractPadData

Fixed extractPadData.js, #1320
Merge pull request #1331 from mluto/fix-locales

Fixed broken placeholders in locales
Localisation updates from http://translatewiki.net.
use .val() instead of [0]
dont run timeslider test for now
fixed 'client implementations'-link in README.md
Merge pull request #1333 from mluto/fix-readme-link

fixed 'client implementations'-link in README.md
Moved console existence check before the variable is used.  This was causing a crash in Internet Explorer when the console was not enabled (console is off by default).
Merge pull request #1336 from poscar/ie_console_fix

Fixed IE crash related to console usage. (Fix #1321)
Merge pull request #1332 from ether/dont-run-timeslider-test

disable timeslider test for now