merged with master branch

1 files changed, 190 insertions, 2 deletions

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5253b461..26b17735 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,6 +9,59 @@
     <option name="archetypesFileLocation" value="archetypes.xml" />

     <option name="workingDirectory" value="" />

   </component>

+  <component name="CCaseConfig">

+    <option name="checkoutReserved" value="false" />

+    <option name="markExternalChangeAsUpToDate" value="true" />

+    <option name="checkInUseHijack" value="true" />

+    <option name="useUcmModel" value="true" />

+    <option name="isOffline" value="false" />

+    <option name="synchOutside" value="false" />

+    <option name="isHistoryResticted" value="true" />

+    <option name="useIdenticalSwitch" value="true" />

+    <option name="synchActivitiesOnRefresh" value="true" />

+    <option name="lastScr" value="" />

+    <option name="scrTextFileName" value="" />

+    <option name="historyRevisionsNumber" value="4" />

+  </component>

+  <component name="DaemonCodeAnalyzer">

+    <disable_hints />

+  </component>

+  <component name="DebuggerManager">

+    <breakpoint_any>

+      <breakpoint>

+        <option name="NOTIFY_CAUGHT" value="true" />

+        <option name="NOTIFY_UNCAUGHT" value="true" />

+        <option name="ENABLED" value="false" />

+        <option name="LOG_ENABLED" value="false" />

+        <option name="LOG_EXPRESSION_ENABLED" value="false" />

+        <option name="SUSPEND_POLICY" value="SuspendAll" />

+        <option name="COUNT_FILTER_ENABLED" value="false" />

+        <option name="COUNT_FILTER" value="0" />

+        <option name="CONDITION_ENABLED" value="false" />

+        <option name="CLASS_FILTERS_ENABLED" value="false" />

+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />

+        <option name="CONDITION" value="" />

+        <option name="LOG_MESSAGE" value="" />

+      </breakpoint>

+      <breakpoint>

+        <option name="NOTIFY_CAUGHT" value="true" />

+        <option name="NOTIFY_UNCAUGHT" value="true" />

+        <option name="ENABLED" value="false" />

+        <option name="LOG_ENABLED" value="false" />

+        <option name="LOG_EXPRESSION_ENABLED" value="false" />

+        <option name="SUSPEND_POLICY" value="SuspendAll" />

+        <option name="COUNT_FILTER_ENABLED" value="false" />

+        <option name="COUNT_FILTER" value="0" />

+        <option name="CONDITION_ENABLED" value="false" />

+        <option name="CLASS_FILTERS_ENABLED" value="false" />

+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />

+        <option name="CONDITION" value="" />

+        <option name="LOG_MESSAGE" value="" />

+      </breakpoint>

+    </breakpoint_any>

+    <breakpoint_rules />

+    <ui_properties />

+  </component>

   <component name="DependencyValidationManager">

     <option name="SKIP_IMPORT_STATEMENTS" value="false" />

   </component>

@@ -38,14 +91,149 @@
     <option name="LOCALE" />

     <option name="OPEN_IN_BROWSER" value="true" />

   </component>

+  <component name="ModuleEditorState">

+    <option name="LAST_EDITED_MODULE_NAME" />

+    <option name="LAST_EDITED_TAB_NAME" />

+  </component>

   <component name="ProjectDetails">

     <option name="projectName" value="osqa" />

   </component>

+  <component name="ProjectLevelVcsManager">

+    <OptionsSetting value="true" id="Add" />

+    <OptionsSetting value="true" id="Remove" />

+    <OptionsSetting value="true" id="Checkout" />

+    <OptionsSetting value="true" id="Update" />

+    <OptionsSetting value="true" id="Status" />

+    <OptionsSetting value="true" id="Edit" />

+    <ConfirmationsSetting value="0" id="Add" />

+    <ConfirmationsSetting value="0" id="Remove" />

+  </component>

+  <component name="ProjectReloadState">

+    <option name="STATE" value="0" />

+  </component>

   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">

     <output url="file://$PROJECT_DIR$/out" />

   </component>

-  <component name="SvnBranchConfigurationManager">

-    <option name="mySupportsUserInfoFilter" value="true" />

+  <component name="Regex">

+    <option name="pos1" value="218" />

+    <option name="pos2" value="218" />

+    <option name="pos3" value="162" />

+    <option name="pos4" value="444" />

+    <option name="pos5" value="162" />

+    <option name="autoUpdate" value="true" />

+    <option name="referenceOn" value="false" />

+    <option name="referencePos" value="0" />

+    <option name="showLabels" value="true" />

+  </component>

+  <component name="RunManager">

+    <configuration default="true" type="Remote" factoryName="Remote">

+      <option name="USE_SOCKET_TRANSPORT" value="true" />

+      <option name="SERVER_MODE" value="false" />

+      <option name="SHMEM_ADDRESS" value="javadebug" />

+      <option name="HOST" value="localhost" />

+      <option name="PORT" value="5005" />

+      <method>

+        <option name="AntTarget" enabled="false" />

+        <option name="BuildArtifacts" enabled="false" />

+        <option name="Maven.BeforeRunTask" enabled="false" />

+      </method>

+    </configuration>

+    <configuration default="true" type="Applet" factoryName="Applet">

+      <module name="" />

+      <option name="MAIN_CLASS_NAME" />

+      <option name="HTML_FILE_NAME" />

+      <option name="HTML_USED" value="false" />

+      <option name="WIDTH" value="400" />

+      <option name="HEIGHT" value="300" />

+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />

+      <option name="VM_PARAMETERS" />

+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

+      <option name="ALTERNATIVE_JRE_PATH" />

+      <method>

+        <option name="AntTarget" enabled="false" />

+        <option name="BuildArtifacts" enabled="false" />

+        <option name="Make" enabled="true" />

+        <option name="Maven.BeforeRunTask" enabled="false" />

+      </method>

+    </configuration>

+    <configuration default="true" type="Application" factoryName="Application">

+      <extension name="coverage" enabled="false" merge="false" />

+      <extension name="snapshooter" />

+      <option name="MAIN_CLASS_NAME" />

+      <option name="VM_PARAMETERS" />

+      <option name="PROGRAM_PARAMETERS" />

+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />

+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

+      <option name="ALTERNATIVE_JRE_PATH" />

+      <option name="ENABLE_SWING_INSPECTOR" value="false" />

+      <option name="ENV_VARIABLES" />

+      <option name="PASS_PARENT_ENVS" value="true" />

+      <module name="" />

+      <envs />

+      <method>

+        <option name="AntTarget" enabled="false" />

+        <option name="BuildArtifacts" enabled="false" />

+        <option name="Make" enabled="true" />

+        <option name="Maven.BeforeRunTask" enabled="false" />

+      </method>

+    </configuration>

+    <configuration default="true" type="JUnit" factoryName="JUnit">

+      <extension name="coverage" enabled="false" merge="false" />

+      <extension name="snapshooter" />

+      <module name="" />

+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

+      <option name="ALTERNATIVE_JRE_PATH" />

+      <option name="PACKAGE_NAME" />

+      <option name="MAIN_CLASS_NAME" />

+      <option name="METHOD_NAME" />

+      <option name="TEST_OBJECT" value="class" />

+      <option name="VM_PARAMETERS" />

+      <option name="PARAMETERS" />

+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />

+      <option name="ENV_VARIABLES" />

+      <option name="PASS_PARENT_ENVS" value="true" />

+      <option name="TEST_SEARCH_SCOPE">

+        <value defaultName="moduleWithDependencies" />

+      </option>

+      <envs />

+      <method>

+        <option name="AntTarget" enabled="false" />

+        <option name="BuildArtifacts" enabled="false" />

+        <option name="Make" enabled="true" />

+        <option name="Maven.BeforeRunTask" enabled="false" />

+      </method>

+    </configuration>

+    <list size="0" />

+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">

+      <Host>localhost</Host>

+      <Port>5050</Port>

+    </configuration>

+  </component>

+  <component name="ShelveChangesManager" show_recycled="false" />

+  <component name="StarteamConfiguration">

+    <option name="SERVER" value="" />

+    <option name="PORT" value="49201" />

+    <option name="USER" value="" />

+    <option name="PASSWORD" value="" />

+    <option name="PROJECT" value="" />

+    <option name="VIEW" value="" />

+    <option name="ALTERNATIVE_WORKING_PATH" value="" />

+    <option name="LOCK_ON_CHECKOUT" value="false" />

+    <option name="UNLOCK_ON_CHECKIN" value="false" />

+  </component>

+  <component name="SvnConfiguration">

+    <option name="USER" value="" />

+    <option name="PASSWORD" value="" />

+    <option name="LAST_MERGED_REVISION" />

+    <option name="UPDATE_RUN_STATUS" value="false" />

+    <option name="MERGE_DRY_RUN" value="false" />

+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />

+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />

+    <option name="IGNORE_SPACES_IN_MERGE" value="false" />

+    <option name="DETECT_NESTED_COPIES" value="false" />

+    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />

+    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />

+    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>

   </component>

   <component name="VssConfiguration">

     <option name="CLIENT_PATH" value="" />