Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
CS-4557: Displaying geo POIs of huge lon/lat values
* fixed
CS-4563: User editing in back-end allows for cross-site scripting

Cast user id parameter to int.
Cast language id parameter to int and fixes error on not found language.
Merge remote-tracking branch 'martin/master'