merge with master
removed some mock data
removed some mock data
Merge pull request #2 from steamhammer/'dev'

'dev'