fix_ios6
merged_with_develop
fix_detail summary