Resolve merge conflicts
Merge branch 'addUIColorHexConverter'
Add filteredArrayUsingBlock method
add NSArray Xtension
Merge branch 'add-NSArrayX'