Merge pull request #11 from choucalate/master

John's mock data & others
added mock regressions and fixes and displayed in frontend