purchase page
Purchase page done
Merging issue-35 into develop and resolving conflicts