Bump minor to 2
Update changelog
Replacing PHP short tags
Replacing PHP short tags (continued...)
Merge branch 'wip' into locations