Move classes back to main repository

OsmAnd-java/.classpath

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="com/OsMoDroid/" kind="src" path="android"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="libs/bsh-core-2.0b4.jar"/>

OsmAnd-java/.project

@@ -14,13 +14,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>android</name>
-			<type>2</type>
-			<locationURI>OSMAND_TRUNK/OsmAnd/gen</locationURI>
-		</link>
-	</linkedResources>
 	<variableList>
 		<variable>
 			<name>OSMAND_TRUNK</name>

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -84,7 +84,7 @@ public class OsmandSettings {
 	private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings"; //$NON-NLS-1$
 	
 	/// Settings variables
-	private final ClientContext ctx;
+	private final OsmandApplication ctx;
 	private SettingsAPI settingsAPI;
 	private Object globalPreferences;
 	private Object defaultProfilePreferences;
@@ -99,7 +99,7 @@ public class OsmandSettings {
 	private List<TileSourceTemplate> internetAvailableSourceTemplates = null;
 	
 	
-	protected OsmandSettings(ClientContext clientContext) {
+	protected OsmandSettings(OsmandApplication clientContext) {
 		ctx = clientContext;
 		settingsAPI = ctx.getSettingsAPI();