Fix 'clean' required when switching between building for device/simulator.
Update build settings to get rid of XCode 4.6 warning.
Merge branch 'fix-clean-required' into develop