temporary commit
Merge remote-tracking branch 'origin/develop' into feature/mo_scroll
Use local sauce connect proxy
button now works (MO scroll)
Removed live-reload. Changed docs to reflect required version of grunt
Merge branch 'feature/mo_scroll' into develop
sbumodule
Merge branch 'develop' of github.com:readium/readium-js-viewer into develop
argh, JSON library was modified in previous branch! Now restored to normal
Merge remote-tracking branch 'origin/develop' into feature/textWidthMargins

Conflicts:
	grunt/express.js
	lib/Readium.js