"Maps Feature added, by default shows world map"
Fixed class path issue
Map displayed with current co-ordinates
map displayed with current location, marker feature added as well
integrating dropbox services in the application
class file changes!
fixed issues related to Maps & R
Merge branch 'master' into map

Conflicts:
	bin/CameraWithButtons.apk
	bin/classes.dex
	bin/resources.ap_
Revert "Merge branch 'master' into map"

This reverts commit 09d8fd0453e641ee42936c6d48201d11179c6973, reversing
changes made to f058ca76617c640d41839e3111860db7afa2b48b.
dropbox works with feature of uploading file
"previous commit was merging upload branch with master"revert if broken
Adding class Diagram for Dropbox, Upload Class
Merge branch 'map'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/CameraWithButtons.apk
	bin/classes.dex
	bin/classes/com/example/camerawithbuttons/MainActivity$2.class
	bin/classes/com/example/camerawithbuttons/MainActivity.class
	bin/classes/com/example/camerawithbuttons/R$id.class
	bin/classes/com/example/camerawithbuttons/R$layout.class
	bin/classes/com/example/camerawithbuttons/R$menu.class
	bin/classes/com/example/camerawithbuttons/R$raw.class
	bin/classes/com/example/camerawithbuttons/R$string.class
	bin/classes/com/example/camerawithbuttons/R$style.class
	bin/classes/com/example/camerawithbuttons/Upload.class
	bin/dexedLibs/dropbox-android-sdk-1.6.1-fc4518990065676967f6cf2968dd0184.jar
	bin/dexedLibs/httpclient-4.0.3-d08a1fc43a43996e51c3f16699f798c9.jar
	bin/dexedLibs/httpcore-4.0.1-414e20b3f74ff2136f2283d6b308bb05.jar
	bin/dexedLibs/httpmime-4.0.3-53c5e32a84e1a254898a139306506300.jar
	bin/dexedLibs/json_simple-1.1-6eb959dd38364b5157a6aa57894a5933.jar
	bin/resources.ap_
	diagrams/ClassDiagram.ucls
	gen/com/example/camerawithbuttons/R.java
	src/com/example/camerawithbuttons/MainActivity.java
unnecessary merge conflict
Revert "Merge branch 'map'"

This reverts commit d45c5a48c35d8ee6daa08b8652784d27291d72e8, reversing
changes made to d2467a93c8379e3948195e5fb4db4e3e97c3760e.

Conflicts:
	bin/classes/com/example/camerawithbuttons/MapPage.class
	bin/classes/com/example/camerawithbuttons/R$attr.class
	bin/classes/com/example/camerawithbuttons/R$dimen.class
	bin/classes/com/example/camerawithbuttons/R$drawable.class
	bin/classes/com/example/camerawithbuttons/R.class
	gen/com/example/camerawithbuttons/R.java