NEW: Page types no longer require a controller, they can inherit the parent page type's

Use ClassInfo::ancestry() instead of get_parent_class()

Fall back to ContentController by default
Merge pull request #881 from kinglozzer/framework-1905-controller-inheritance

NEW: Page types no longer require their own controller (fixes silverstripe/silverstripe-framework#1905)
API JS i18n files with short locale names, generated by build task

The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
Fix comment typo
Merge pull request #887 from trev/patch-1

Fix comment typo
Set default encoding for compass

See https://github.com/silverstripe/silverstripe-framework/pull/2620
Merge pull request #888 from kinglozzer/patch-1

Set default encoding for compass
Merge pull request #884 from chillu/pulls/js-i18n-3.1

API JS i18n files with short locale names, generated by build task
Disable UploadField change detection in assets/admin/add

See https://github.com/silverstripe/silverstripe-framework/issues/2638
Refactor old page redirector into an extension
Merge pull request #801 from ss23/refactor-old-page-redirector

Refactor old page redirector into an extension
Merge pull request #889 from chillu/pulls/2638-uploadfield

Disable UploadField change detection in assets/admin/add
Updated translations
Merge branch '3.1'

Conflicts:
	lang/es.yml