Issue 1353: Made "total cost" tool tip in order system more explicit about VAT and shipping costs
Issue 1048 - Configure androidNewUpdateManifestPath on the update servers
Issue 1379: Update to nginx 1.6.2
Merge branch 'master' into travis-ci