Merge branch 'Development'
Merge branch 'Development'
Merge branch 'Development'
Added Social Links to Artist Profiles
Merge branch 'master' into Development

Conflicts:

YesTattoo/YesTattoo.xcodeproj/project.xcworkspace/xcuserdata/nestorzeped
a.xcuserdatad/UserInterfaceState.xcuserstate