Merge branch 'develop' into release

Conflicts:
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/BuildPackageObjectAction.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/PlatformProjectDependentPackager.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/BuildSystemTab.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/PkgMgrUIMessages.properties
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/RemoveInstalledPackageDialog.java
	package/pkginfo.manifest

diff --cc org.tizen.nativeplatform/plugin.xml
index e1a9233,df3f379..d220e3c
--- 1/org.tizen.nativeplatform/plugin.xml
--- 2/org.tizen.nativeplatform/plugin.xml
+++ b/org.tizen.nativeplatform/plugin.xml
@@@ -536,5 -567,154 +567,154 @@@
              </enablement>
          </objectContribution>          
      </extension>
+       <extension
+       point="org.eclipse.cdt.core.templateProcessTypes">
+         <processType
+                       name="TizenTemplateProcess"
+                       processRunner="org.tizen.nativeplatform.templateengine.TizenTemplateProcess">
+                       <simple
+                               name="projectName">
+               </simple>
+             <simple
+               name="projType">
+                       </simple>
+               </processType>
+       </extension>
+       
+       <extension
+               point="org.eclipse.ui.preferencePages">
+               <page
+                       category="org.tizen.common.preferences.tizencommon"
+                       class="org.tizen.nativeplatform.preferences.ui.PlatformPreferencePage"
+                       id="org.tizen.nativeplatform.preferences"
+                       name="%org.tizen.nativeplatform.page.name">
+               </page>
+       </extension>
+       
+       <extension
+               point="org.eclipse.ui.preferencePages">
+               <page
+                       category="org.tizen.nativeplatform.preferences"
+                       class="org.tizen.nativeplatform.preferences.ui.git.GitConfigurationPreferencePage"
+                       id="org.tizen.nativeplatform.gitconfig"
+                       name="%org.tizen.nativeplatform.gitconfig.label">
+               </page>
+       </extension>
+       
+       <extension
+               point="org.eclipse.ui.preferencePages">
+               <page
+                       category="org.tizen.nativeplatform.preferences"
+                       class="org.tizen.nativeplatform.preferences.ui.proxy.HttpProxyPreferencePage"
+                       id="org.tizen.nativeplatform.gitconfig"
+                       name="%org.tizen.nativeplatform.proxyconfig.label">
+               </page>
+       </extension>
+       
+       <extension
+               point="org.eclipse.ui.preferencePages">
+               <page
+                       category="org.tizen.nativeplatform.preferences"
+                       class="org.tizen.nativeplatform.preferences.ui.password.PasswdPreferencePage"
+                       id="org.tizen.nativeplatform.password"
+                       name="%org.tizen.nativeplatform.password.label">
+               </page>
+       </extension>
+       
+       
+       <extension
+          point="org.eclipse.ui.perspectiveExtensions">
+       <perspectiveExtension
+             targetID="org.tizen.nativeplatform.perspective">
+          <newWizardShortcut
+                id="org.tizen.nativeplatform.newCategory.newWizard.feature">
+          </newWizardShortcut>
+       </perspectiveExtension>
+     </extension>   
+     
+       <extension
+          point="org.eclipse.ui.perspectiveExtensions">      
+       <perspectiveExtension
+             targetID="org.tizen.nativeplatform.perspective">
+          <view
+                ratio="1"
+                relationship="bottom"
+                relative="org.eclipse.ui.navigator.ProjectExplorer"
+                id="org.tizen.common.connection.ui.ConnectionExplorer">
+          </view>
+          <viewShortcut
+                id="org.tizen.common.connection.ui.ConnectionExplorer">
+          </viewShortcut>
+       </perspectiveExtension>
+       </extension>
+       
+       <extension
+          point="org.eclipse.ui.perspectiveExtensions">
+        
+       <perspectiveExtension
+             targetID="org.tizen.nativeplatform.perspective">
+          <view
+                id="org.tizen.common.connection.ui.LogView"
+                ratio="1"
+                relationship="stack"
+                relative="org.eclipse.ui.views.TaskList">
+          </view>
+          <viewShortcut
+                id="org.tizen.common.connection.ui.LogView">
+          </viewShortcut>
+       </perspectiveExtension>
+    </extension>
+    
+       <extension
+          point="org.eclipse.ui.perspectiveExtensions">  
+       <perspectiveExtension
+             targetID="org.tizen.nativeplatform.perspective">
+          <view
+                id="org.tizen.nativeplatform.views.ui.RootstrapView"
+                ratio="1"
+                relationship="stack"
+                relative="org.eclipse.ui.views.ContentOutline">
+          </view>
+          <viewShortcut
+                id="org.tizen.nativeplatform.views.ui.RootstrapView">
+          </viewShortcut>
+       </perspectiveExtension>
+       </extension>
+    
+       <extension
+          point="org.eclipse.ui.views">
+               <view
+               category="org.tizen.nativeapp.viewCategory"
+             class="org.tizen.nativeplatform.views.ui.RootstrapView"           
+             icon="icons/rootstrap/server.gif"                        
+             id="org.tizen.nativeplatform.views.ui.RootstrapView"
+             name="%view.rootstrap"
+             restorable="true">
+       </view>
+       </extension>
+       
+               <extension
+          point="org.eclipse.ui.contexts">
+       <context
+             id="org.tizen.common.rootstrap.setdefault.context"
+             name="Select"
+             parentId="org.eclipse.ui.contexts.window">
+       </context>    
+       <context
+             id="org.tizen.common.rootstrap.lauchpkgmgr.context"
+             name="Manage packages"
+             parentId="org.eclipse.ui.contexts.window">
+       </context>
+             <context
+             id="org.tizen.common.rootstrap.remove.context"
+             name="Remove"
+             parentId="org.eclipse.ui.contexts.window">
+       </context>            
+       <context
+             id="org.tizen.common.rootstrap.export.context"
+             name="Export"
+             parentId="org.eclipse.ui.contexts.window">
+       </context>
+       </extension>
  <!-- package manager end -->
 -</plugin>
 +</plugin>