Merge remote-tracking branch 'origin/jay' into jay
Merge branch 'jay' into jem
added commission rate
added site stats and sorting of page
change texts
Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into jay
all