drawer
support for search by location and gps position
.
git ignore
ignoring .class files
ignoring apk
Merge branch 'navigation-drawer' into drawer-to-master-merge-branch

Conflicts:
	.gitignore
	bin/Gasolina.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/numicago/android/gasolina/R$id.class
	bin/classes/com/numicago/android/gasolina/R$integer.class
	bin/classes/com/numicago/android/gasolina/R$layout.class
	bin/classes/com/numicago/android/gasolina/R$menu.class
	bin/classes/com/numicago/android/gasolina/R$string.class
	bin/classes/com/numicago/android/gasolina/R$style.class
	bin/classes/com/numicago/android/gasolina/R$styleable.class
	bin/classes/com/numicago/android/gasolina/R$xml.class

bin/classes/com/numicago/android/gasolina/activities/PreferencesActivity
$SettingsFragment.class

bin/classes/com/numicago/android/gasolina/activities/PreferencesActivity
.class

bin/classes/com/numicago/android/gasolina/activities/StationDetailsActiv
ity.class

bin/classes/com/numicago/android/gasolina/activities/StationsListActivit
y$1.class

bin/classes/com/numicago/android/gasolina/activities/StationsListActivit
y$2.class

bin/classes/com/numicago/android/gasolina/activities/StationsListActivit
y.class

bin/classes/com/numicago/android/gasolina/activities/viewloaders/IUIFini
shDelegator.class

bin/classes/com/numicago/android/gasolina/activities/viewloaders/Station
DetailsViewLoader.class

bin/classes/com/numicago/android/gasolina/activities/viewloaders/Station
sListViewLoader$1.class

bin/classes/com/numicago/android/gasolina/activities/viewloaders/Station
sListViewLoader.class

bin/classes/com/numicago/android/gasolina/adapters/StationItemAdapter.cl
ass

bin/classes/com/numicago/android/gasolina/dataloaders/StationsApiLoader.
class
	bin/classes/com/numicago/android/gasolina/objects/Station.class

bin/classes/com/numicago/android/gasolina/settings/ApplicationSettings.c
lass
	bin/dexedLibs/android-support-v4-db6df8c23cef72fe040a4ff065799bb6.jar

bin/dexedLibs/android-support-v7-appcompat-1c3c01fbec885511d1a0780f672e7
4fe.jar

bin/dexedLibs/android-support-v7-appcompat-1ffd2b4a24e6ba71e4116e16f1665
122.jar
	bin/dexedLibs/google-play-services-ad24b03cf0314b5910b0d534bf909230.jar

bin/dexedLibs/google-play-services_lib-370ba835e6ca3da62aa8a5b27eedc0ea.
jar
	bin/dexedLibs/gson-2.2.4-a26e2641bf3da5061dc6d09d60e922b0.jar
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/numicago/android/gasolina/R.java
	res/layout/search_modal.xml
	res/menu/main_activity_actions.xml
	res/values-en/strings.xml
	res/values-pt/strings.xml
	src/com/numicago/android/gasolina/activities/StationsListActivity.java

src/com/numicago/android/gasolina/activities/viewloaders/StationsListVie
wLoader.java
	src/com/numicago/android/gasolina/dataloaders/StationsApiLoader.java
	src/com/numicago/android/gasolina/settings/ApplicationSettings.java
.
Merge branch 'drawer-to-master-merge-branch'