Added require.js modules and debug
Merge branch 'master' of github.com:wilsonpage/firefoxos-media-backup

Conflicts:
	index.html
	js/services/dropbox/dropbox.js