routing full site done
Merging issue-79 into develop and resolved conflicts