structured file system and imports
Merge branch 'master' of https://github.com/eyeswideopen/AirScratch

Conflicts:
	.gitignore
	src/common/LeapController.py
	src/scratching/MainController.py