Revert to local device repo
Comment out unnecessary ref's
Merge branch 'jellybean' of https://github.com/shumashv1/Schizoid into jellybean

Conflicts:
	default.xml