Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
rm aptana project file
assets compile switch to true
Fix for condition_array=nil default in models (use [] instead)