affiliates page done
Merging issue-6 into develop and resolved conflicts