Added rank field to modCategory
Added sqlsrv map/schema, but untested...no MS Server, sorry
Added rank field to create and update windows + moved code to windows.js
Made TV vertical tabs sortable by rank
Also add sorting by rank first, then category for the property set tree
Start solving merge conflicts
Window code moving actually made sense...
Fixed merge conflict and rebased on current develop
Add option to specify rank on joinGroup()
Fixed bug with JSON array from context setting

as described here: http://forums.modx.com/thread/?thread=81470
originally fixed by Fi1osof: https://github.com/Fi1osof/revolution/commit/111556798b8afa8fbd8444a55753d251083d0315
Added system settings to enable customization of the top bar navigation (main/user)
Added ability to edit a media source from the files tree
Multiusers check permission

For example:
$resource = $modx->getObject('modResource', $id);
foreach($modx->getCollection('modUser') as $user){
    print (int)$resource->checkPolicy('view', null, $user);
}
Added ability to customize context icons (per context)
Class-based modPluginEventAssociateProcessor
Add checkSavePermission
Prevent submit with unselected plugin
autoHeight window while show errors
Class-based plugin/event/getAssoc processor
Move refreshURIs() call from modSystemClearCacheProcessor, adds new dedicated refreshURIs menu item and MODx.refreshURIs()
Fix some processor path (update user after creation)