Merge pull request #1 from jikk/taintdroid-4.1.1_r6

Taintdroid 4.1.1 r6
Added identification of providers etc
added location
Added periodic thread and second activity
Fixed bug in IMSI Service handling
fix to  location change responses
geo location issue resolved.
clean up code.

I just adjusted some branch structures to make code look cleaner.
Merge pull request #2 from jikk/marios

Marios
Merge branch 'master' into taintdroid-4.1.1_r6

Conflicts:
	src/edu/columbia/gpsapp/GPSTracker.java