Merge remote-tracking branch 'origin/development' 3/27/2013
File Normalization
Fix conflicts