Updated Fan profile and editted links
Merge branch 'develop'