Merge branch 'develop' into ios7skins