Add mock location stuff to the zipfile
Add any stuff that won't increase the size of the app

Conflicts:

	assets/mock-locations.zip
	noneclipse/mock-locations.txt
Merge branch 'master' into mock