adding marker support for mainavtivity
adding stopmarker class and bus_stop marker icon
adding merge change for MainActivity
adding gitignore file
Merge branch 'develop' into frossty

Signed-off-by: Waqas Home <frossty@lookin2share@gmail.com>
fixing init map location
-adding progress bar when loading stops
-adding support for zoom to my location
Merge branch 'frossty' into feature/Adding-location-service

Conflicts:
	Android/KNOWtime/bin/AndroidManifest.xml
	Android/KNOWtime/bin/KNOWtime.apk
	Android/KNOWtime/bin/R.txt
	Android/KNOWtime/bin/classes.dex
	Android/KNOWtime/bin/classes/com/google/android/gms/R$attr.class
	Android/KNOWtime/bin/classes/com/google/android/gms/R$color.class
	Android/KNOWtime/bin/classes/com/google/android/gms/R$drawable.class
	Android/KNOWtime/bin/classes/com/google/android/gms/R$id.class
	Android/KNOWtime/bin/classes/com/google/android/gms/R$styleable.class
	Android/KNOWtime/bin/classes/com/knowtime/MainActivity.class
	Android/KNOWtime/bin/classes/com/knowtime/R$drawable.class
	Android/KNOWtime/bin/classes/com/knowtime/R$id.class
	Android/KNOWtime/bin/classes/com/knowtime/R$integer.class
	Android/KNOWtime/bin/classes/com/knowtime/R$layout.class
	Android/KNOWtime/bin/classes/com/knowtime/R$menu.class
	Android/KNOWtime/bin/classes/com/knowtime/R$string.class
	Android/KNOWtime/bin/classes/com/knowtime/R$style.class
	Android/KNOWtime/bin/classes/com/knowtime/R$styleable.class
	Android/KNOWtime/bin/dexedLibs/android-support-v4-00dfdc1259698b5a220261b89d7d8e25.jar
	Android/KNOWtime/bin/dexedLibs/google-play-services-433947e3f7afa94203203b6f465b1d6f.jar
	Android/KNOWtime/bin/dexedLibs/google-play-services_lib-22e72e91987357b2fb81b1108bcff974.jar
	Android/KNOWtime/bin/resources.ap_
	Android/KNOWtime/gen/com/knowtime/R.java
	Android/KNOWtime/res/values/strings.xml
	Android/KNOWtime/src/com/knowtime/MainActivity.java
Merged Wasaq code into the app.
Removing .class files.