changes needed to the template for https://github.com/opengeo/mapstory/issues/506
Merge branch 'master' into integration