Add slide over
Add bases for Maps view
Merge branch 'AJS_dev'
Get Google maps working

Remove android support v4 (google play services provides its own)
Update appcompat
Update proguard (move content from .txt file to .cfg)
Remove unnecessary google-play-services.jar.properties
Merge branch 'AJS_maybe_fix_gmaps_integration' into KJI_dev
Update android target?
Use Google Maps library instead of jar
Cleanup code, add starting and stopping of service in drawer
Update fragments and string resources

Add a settings fragment to be fleshed out later
Use a mapview instead of SupportMapFragment
(Poorly) prevent currently selected fragments from being selected again
Explicitly express need to use a personal debug key in the Manifest
Add some icons (Thanks Kylie)
Merge branch 'AJS_work_on_gmaps'

Conflicts:
	AndroidManifest.xml
	src/com/kab/wherefi/MainActivity.java
	src/com/kab/wherefi/service/DataService.java
Cleanup and icons update
Add initial debug fragment and scale down some icons
Consistency
Prevent duplicate fragment loading the right way