fixed issue 1179
Merge pull request #1190 from ne0fhyk/fix_issue_1179

Fix issue 1179
merged android lib project back into the android project.
updated list of files to ignore.
update cleanup
Merge pull request #1191 from ne0fhyk/merge_android_lib

Merge android lib
fixed issue 1182
Merge pull request #1192 from ne0fhyk/fix_issue_1182

Fix issue 1182
Merge branch 'master' into compassCalibration

Conflicts:
	Android/res/drawable/button_green.xml
	AndroidLib/res/drawable/button_green.xml
	AndroidLib/res/drawable/button_green_drawable.xml
	Desktop/src/org/droidplanner/desktop/location/FakeLocation.java