BUGFIX: Allow template globals to be used in both object and value contexts (e.g. $Now.Year)
BUGFIX: Allow template globals to return objects as well as values.
API CHANGE: Rename 'PastMember' to 'IsRepeatMember' in templates.
API CHANGE: Move Controller::PastMember() to Member::is_repeat_member() in code.
API CHANGE: Removed Controller::CurrentMember(), it was only ever intended as a template global provider.
API CHANGE: Remove Controller::Now(), as it was only ever a template global provider, and use the new TemplateGlobalProvider interface on SS_Datetime instead.
MINOR: SCSS refactoring

1. Refactored some gridfield styles to enable reuse (created a mixin
file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldn't appear in generated
css
ENHANCEMENT: Gridfield usability (fixes 7215)

1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates
(spans were being inserted inside spans), and adjusted styles. Added
extra class to template
5. Added "filter by ..." placeholder text to input fields
BUGFIX: Fix checking for flawed blowfish encryption
Merge pull request #447 from ajoneil/blowfish-fix

BUGFIX: Fix checking for flawed blowfish encryption
BUGFIX: Fix where filter appears

Make filter only appear in GridFields that include the
GridFieldFilterHeader component
BUGFIX: Fix pagination buttons

Disable ability to click on disabled pagination buttons
BUGFIX: Re-add status for successful upload
Merge pull request #449 from adrexia/broken-pagination

BUGFIX: Fix pagination buttons
Merge pull request #450 from adrexia/file-upload-status

BUGFIX: Re-add status for successful upload
MINOR Css coding conventions for CMS
MINOR Updated security documentation (phpdoc and markdown) around new DataList and SQLQuery APIs, additional automatic escaping on some stricter inputs like column names
Merge pull request #446 from adrexia/sapphire

---

MINOR: SCSS refactoring
1. Refactored some gridfield styles to enable reuse (created a mixin file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldnt appear in generated css

ENHANCEMENT: Gridfield usability (fixes 7215)
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates (spans were being inserted inside spans), and adjusted styles. Added extra class to template
5. Added "filter by ..." placeholder text to input fields

Conflicts:
	css/GridField.css
Merge pull request #451 from chillu/security-docs

Improved security docs around DataList, SQLQuery
Merge branch 'master' of github.com:silverstripe/sapphire
MINOR Fixed syntax errors from SQLQuery/DataQuery cleanup
SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205)
BUGFIX: GridField filter

Make sure the new class is used consistently, and has the correct css
applied to it.