changed router, addded mocks and get requests
Merge branch 'master' of https://github.com/bitterbit/Gigglypeace-web

Conflicts:
	router.js