Fixing pagination and robs stupidy
branding changes #1

Conflicts:
	app/lib/router.js
fixing pagination issues
Merge pull request #68 from Heydon/feedback-merge

branding changes #1
Removed tests while we investigate them failing (The tests didnt do anything anyway)
Merge pull request #69 from Heydon/fix-story-pagination

Fix story pagination
merge branch 'master' into 47/story-audio

Conflicts:
	app/lib/router.js
Fixed tests
Merge branch 'master' into 47/story-audio