[MERGE] upstream
[MERGE] sitemap backport, merge trunk from 9438 til 9440

merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
[MERGE] upstream
[FIX] broken routes for pages
[MERGE] sitemap backport, merge trunk from 9438 til 9440

merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
[FIX] google maps controller should be for POST only
[FIX] survey route that is only accessed with POST verb