apk created
Merge remote-tracking branch 'origin/master'

Conflicts:
	MITLocator/src/com/mit/mitlocator/MainActivity.java