Moved profile_opts to proper file
Merge branch 'oo-uploads'
Missing class name on function calls
Merge branch 'bugfixes'

Conflicts:
	fannie/reports/DepartmentMovement/DepartmentMovementReport.php
Bad var in query
Merge branch 'bugfixes'
Added split capacity for large file uploads.