Fixed minor bugs inserted in clean-up

AndroidManifest.xml

@@ -88,7 +88,7 @@
         </activity>
 
         <service
-            android:name=".authenticator.AccountAuthenticatorService"
+            android:name=".authentication.AccountAuthenticatorService"
             android:exported="true">
             <intent-filter  android:priority="100">
                 <action android:name="android.accounts.AccountAuthenticator" />
@@ -120,7 +120,7 @@
         </provider>
 
         <activity
-            android:name=".ui.activity.AuthenticatorActivity"
+            android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
             android:theme="@style/Theme.ownCloud.noActionBar" 
             android:launchMode="singleTask">
@@ -166,9 +166,6 @@
         </receiver>
         <service android:name=".files.services.FileObserverService"/>
         
-        <service android:name=".authenticator.oauth2.services.OAuth2GetTokenService" >
-        </service>
-        
     </application>
 
 </manifest>

src/com/owncloud/android/operations/OAuth2GetAccessToken.java

@@ -62,7 +62,7 @@ public class OAuth2GetAccessToken extends RemoteOperation {
             }
             
             if (result == null) { 
-                NameValuePair[] nameValuePairs = new NameValuePair[5];
+                NameValuePair[] nameValuePairs = new NameValuePair[4];
                 nameValuePairs[0] = new NameValuePair(OAuth2Constants.KEY_GRANT_TYPE, mGrantType);
                 nameValuePairs[1] = new NameValuePair(OAuth2Constants.KEY_CODE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Constants.KEY_CODE));            
                 nameValuePairs[2] = new NameValuePair(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri);