Lib Parse
Tabbed VIew
Merge remote-tracking branch 'master/master'

Conflicts:
	streets-android/AndroidManifest.xml
	streets-android/android.iml
	streets-android/gen-external-apklibs/~apklib-com.actionbarsherlock_actionbarsherlock_4.4.0.iml
	streets-android/pom.xml
	streets-android/res/layout/activity_streets.xml
	streets-android/res/layout/streets_layout.xml
	streets-android/src/main/java/net/blaklizt/streets/android/MainLayout.java
	streets-android/src/main/java/net/blaklizt/streets/android/MapLayout.java
	streets-android/src/main/java/net/blaklizt/streets/android/Streets.java
	streets-android/src/main/java/net/blaklizt/streets/android/StreetsLayout.java
	streets-android/streets-android.iml
Navigation