Minor Opensocial Fixes
Changing URL of example opensocial apps to http://profiles.ucsf.edu/apps_2.1/
Changing display order.
Update ORNG features in web.config
2.1.0 Documentation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Database/Data/InstallData.xml