fixed merge issues in stats
change stats page and splashpage location
Merge branch 'master' of https://github.com/motivate/motivate
fixing up file structure