Fix Webkit mulitple select bug. Closes #2127
Fix Child Associations showing as 'None'. Closes #2130
Remove XSRF options, make token as long as the session. RE #2118
Bump the version number, release 2.5.0 beta 2
Reorganise the index logic, allows launcher to be overridden
Merge remote-tracking branch 'origin/integration' into cookies-sessions

Conflicts:
	symphony/lib/core/class.symphony.php
	symphony/lib/toolkit/class.general.php