update deprecated api call for ios6
Merge branch 'develop' into features/storyboard