Initial commit from local repository
Merge branch 'master' of https://github.com/MrSparc/coursera-android

Conflicts:
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/layout/footer_view.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/layout/place_badge_view.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/menu/main.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values-sw600dp/dimens.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values-sw720dp-land/dimens.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values-v11/styles.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values-v14/styles.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values/dimens.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values/strings.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/res/values/styles.xml
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/src/course/labs/locationlab/MockLocationProvider.java
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/src/course/labs/locationlab/PlaceDownloaderTask.java
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/src/course/labs/locationlab/PlaceRecord.java
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/src/course/labs/locationlab/PlaceViewActivity.java
	Lab 9 - Location/SourceFiles/Skeleton/LocationLab/src/course/labs/locationlab/PlaceViewAdapter.java
	Lab 9 - Location/SourceFiles/TestCases/LocationLabTest/.classpath
merge