diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c2da4d..6f91104 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="0b0dd0be-083d-4a37-a2a3-18cfd7e7ab2c" name="Default" comment="base test update">
+<<<<<<< Updated upstream
+    <list default="true" id="0b0dd0be-083d-4a37-a2a3-18cfd7e7ab2c" name="Default" comment="uprava uzivatele">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportsMenDaoImpl.java" afterPath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportsMenDaoImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Competition.java" afterPath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Competition.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/User.java" afterPath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/User.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java" afterPath="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java" />
+=======
+    <list default="true" id="0b0dd0be-083d-4a37-a2a3-18cfd7e7ab2c" name="Default" comment="``base test update``">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+>>>>>>> Stashed changes
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -39,7 +43,7 @@
       <file leaf-file-name="Competition.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Competition.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="388">
+            <state relative-caret-position="595">
               <caret line="39" column="25" lean-forward="false" selection-start-line="39" selection-start-column="25" selection-end-line="39" selection-end-column="25" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -97,20 +101,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BaseDao.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/BaseDao.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="595">
-              <caret line="36" column="12" lean-forward="false" selection-start-line="36" selection-start-column="12" selection-end-line="36" selection-end-column="12" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="SportsMenDaoImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportsMenDaoImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="219">
+            <state relative-caret-position="323">
               <caret line="23" column="60" lean-forward="false" selection-start-line="23" selection-start-column="60" selection-end-line="23" selection-end-column="60" />
               <folding />
             </state>
@@ -130,10 +124,11 @@
       <file leaf-file-name="BaseDaoImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/BaseDaoImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+            <state relative-caret-position="316">
+              <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="e#548#549#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -162,7 +157,7 @@
       <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/User.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="371">
+            <state relative-caret-position="1700">
               <caret line="142" column="5" lean-forward="false" selection-start-line="142" selection-start-column="5" selection-end-line="142" selection-end-column="5" />
               <folding />
             </state>
@@ -172,8 +167,13 @@
       <file leaf-file-name="SportEvent.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
+<<<<<<< Updated upstream
+            <state relative-caret-position="435">
+              <caret line="101" column="0" lean-forward="false" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" />
+=======
+            <state relative-caret-position="476">
               <caret line="33" column="33" lean-forward="false" selection-start-line="33" selection-start-column="33" selection-end-line="33" selection-end-column="33" />
+>>>>>>> Stashed changes
               <folding />
             </state>
           </provider>
@@ -182,7 +182,7 @@
       <file leaf-file-name="AopUtils.class" pinned="false" current-in-tab="false">
         <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.11.RELEASE/spring-aop-4.3.11.RELEASE.jar!/org/springframework/aop/support/AopUtils.class">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="429">
+            <state relative-caret-position="2635">
               <caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
               <folding />
             </state>
@@ -192,7 +192,7 @@
       <file leaf-file-name="Sport.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Sport.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
+            <state relative-caret-position="153">
               <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -213,11 +213,56 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SportsMenDaoImplTest.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="SportsMenDaoImplTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="439">
-              <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+<<<<<<< Updated upstream
+            <state relative-caret-position="571">
+              <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
+=======
+            <state relative-caret-position="396">
+              <caret line="80" column="0" lean-forward="false" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
+>>>>>>> Stashed changes
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+<<<<<<< Updated upstream
+      <file leaf-file-name="SportEventDaoImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SportEventDaoImplTest.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="486">
+              <caret line="60" column="9" lean-forward="true" selection-start-line="60" selection-start-column="9" selection-end-line="60" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SportEventDao.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+=======
+      <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="424">
+              <caret line="283" column="12" lean-forward="false" selection-start-line="283" selection-start-column="12" selection-end-line="283" selection-end-column="12" />
+>>>>>>> Stashed changes
               <folding />
             </state>
           </provider>
@@ -254,6 +299,8 @@
       <find>ma</find>
       <find>persist</find>
       <find>persi</find>
+      <find>pers</find>
+      <find>persista</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -261,7 +308,7 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="sportsmen-manyToMany-update" />
       </map>
     </option>
   </component>
@@ -271,9 +318,9 @@
     </option>
   </component>
   <component name="IdeDocumentHistory">
+<<<<<<< Updated upstream
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/dao/SportsMen.java" />
         <option value="$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/dao/SportsMenImpl.java" />
         <option value="$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/enums/Gender.java" />
         <option value="$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/enums/Gendre.java" />
@@ -303,7 +350,6 @@
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/PersistenceSampleApplicationContext.java" />
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Team.java" />
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Identifiable.java" />
-        <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java" />
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/BaseEntity.java" />
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportsMenDao.java" />
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/UserDao.java" />
@@ -324,8 +370,13 @@
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Competition.java" />
         <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/User.java" />
         <option value="$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java" />
+        <option value="$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java" />
+        <option value="$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java" />
       </list>
     </option>
+=======
+    <option name="CHANGED_PATHS" />
+>>>>>>> Stashed changes
   </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
@@ -378,7 +429,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -386,6 +438,11 @@
               <item name="SportEventManager" type="b2602c69:ProjectViewProjectNode" />
               <item name="SportEventManager" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="SportEventManager" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SportEventManager" type="462c0819:PsiDirectoryNode" />
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="SportEventManager" type="b2602c69:ProjectViewProjectNode" />
               <item name="SportEventManager" type="462c0819:PsiDirectoryNode" />
@@ -487,9 +544,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -510,18 +566,18 @@
     <key name="CreateTestDialog.RecentsKey">
       <recent name="cz.fi.muni.pa165.dao" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/persistance/src/main" />
-      <recent name="$PROJECT_DIR$/persistance/src" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="cz.muni.fi.pa165.dao" />
+      <recent name="cz.muni.fi.pa165.services" />
+      <recent name="cz.muni.fi.pa165.enums" />
     </key>
     <key name="CreateTestDialog.Recents.Supers">
       <recent name="" />
       <recent name="cz.fi.muni.pa165.dao.BaseDaoImplTest" />
     </key>
-    <key name="CreateClassDialog.RecentsKey">
-      <recent name="cz.muni.fi.pa165.dao" />
-      <recent name="cz.muni.fi.pa165.services" />
-      <recent name="cz.muni.fi.pa165.enums" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/persistance/src/main" />
+      <recent name="$PROJECT_DIR$/persistance/src" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -536,8 +592,8 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="TestNG.SportsMenDaoImplTest.testRemoveFromCompetition">
-    <configuration name="BaseDaoImplTest" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="TestNG.SportEventDaoImplTest.fail">
+    <configuration name="SportEventDaoImplTest" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="cz.fi.muni.pa165.dao.*" />
@@ -549,7 +605,7 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" value="cz.fi.muni.pa165.dao" />
-      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.BaseDaoImplTest" />
+      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportEventDaoImplTest" />
       <option name="METHOD_NAME" />
       <option name="GROUP_NAME" />
       <option name="TEST_OBJECT" value="CLASS" />
@@ -569,7 +625,7 @@
       <properties />
       <listeners />
     </configuration>
-    <configuration name="SportsMenDaoImplTest" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
+    <configuration name="SportEventDaoImplTest.delete" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="cz.fi.muni.pa165.dao.*" />
@@ -581,10 +637,10 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" value="cz.fi.muni.pa165.dao" />
-      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportsMenDaoImplTest" />
-      <option name="METHOD_NAME" />
+      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportEventDaoImplTest" />
+      <option name="METHOD_NAME" value="delete" />
       <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="TEST_OBJECT" value="METHOD" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -601,7 +657,7 @@
       <properties />
       <listeners />
     </configuration>
-    <configuration name="SportsMenDaoImplTest.testAddToCompetition" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
+    <configuration name="SportEventDaoImplTest.fail" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="cz.fi.muni.pa165.dao.*" />
@@ -613,8 +669,40 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" value="cz.fi.muni.pa165.dao" />
-      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportsMenDaoImplTest" />
-      <option name="METHOD_NAME" value="testAddToCompetition" />
+      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportEventDaoImplTest" />
+      <option name="METHOD_NAME" value="fail" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="METHOD" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration name="SportEventDaoImplTest.findAll" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="cz.fi.muni.pa165.dao.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="persistence" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" value="cz.fi.muni.pa165.dao" />
+      <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportEventDaoImplTest" />
+      <option name="METHOD_NAME" value="findAll" />
       <option name="GROUP_NAME" />
       <option name="TEST_OBJECT" value="METHOD" />
       <option name="VM_PARAMETERS" value="-ea" />
@@ -633,7 +721,7 @@
       <properties />
       <listeners />
     </configuration>
-    <configuration name="SportsMenDaoImplTest.testRemoveFromCompetition" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
+    <configuration name="SportsMenDaoImplTest.testFindAll" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="cz.fi.muni.pa165.dao.*" />
@@ -646,7 +734,7 @@
       <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" value="cz.fi.muni.pa165.dao" />
       <option name="MAIN_CLASS_NAME" value="cz.fi.muni.pa165.dao.SportsMenDaoImplTest" />
-      <option name="METHOD_NAME" value="testRemoveFromCompetition" />
+      <option name="METHOD_NAME" value="testFindAll" />
       <option name="GROUP_NAME" />
       <option name="TEST_OBJECT" value="METHOD" />
       <option name="VM_PARAMETERS" value="-ea" />
@@ -781,53 +869,21 @@
       <module name="parent" />
       <envs />
     </configuration>
-    <configuration name="cz.fi.muni.pa165.dao" type="TestNG" factoryName="TestNG" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cz.fi.muni.pa165.dao.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="persistence" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" value="cz.fi.muni.pa165.dao" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="PACKAGE" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-    </configuration>
     <list size="6">
       <item index="0" class="java.lang.String" itemvalue="Maven.Unnamed" />
-      <item index="1" class="java.lang.String" itemvalue="TestNG.BaseDaoImplTest" />
-      <item index="2" class="java.lang.String" itemvalue="TestNG.cz.fi.muni.pa165.dao" />
-      <item index="3" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest" />
-      <item index="4" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest.testAddToCompetition" />
-      <item index="5" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest.testRemoveFromCompetition" />
+      <item index="1" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest.testFindAll" />
+      <item index="2" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest" />
+      <item index="3" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest.findAll" />
+      <item index="4" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest.delete" />
+      <item index="5" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest.fail" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest.testRemoveFromCompetition" />
-        <item index="1" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest.testAddToCompetition" />
-        <item index="2" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest" />
-        <item index="3" class="java.lang.String" itemvalue="TestNG.cz.fi.muni.pa165.dao" />
-        <item index="4" class="java.lang.String" itemvalue="TestNG.BaseDaoImplTest" />
+        <item index="0" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest.fail" />
+        <item index="1" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest.delete" />
+        <item index="2" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest.findAll" />
+        <item index="3" class="java.lang.String" itemvalue="TestNG.SportEventDaoImplTest" />
+        <item index="4" class="java.lang.String" itemvalue="TestNG.SportsMenDaoImplTest.testFindAll" />
       </list>
     </recent_temporary>
   </component>
@@ -855,7 +911,12 @@
       <workItem from="1509025984823" duration="2746000" />
       <workItem from="1509030615001" duration="4222000" />
       <workItem from="1509134599875" duration="1119000" />
+<<<<<<< Updated upstream
+      <workItem from="1509136160454" duration="2971000" />
+=======
       <workItem from="1509136160454" duration="1352000" />
+      <workItem from="1509139524973" duration="85000" />
+>>>>>>> Stashed changes
     </task>
     <task id="LOCAL-00001" summary="project creation">
       <created>1507991497543</created>
@@ -920,43 +981,65 @@
       <option name="project" value="LOCAL" />
       <updated>1509134993620</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="uprava uzivatele">
+      <created>1509137535367</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1509137535367</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="SportsMenDaoImplTest - 2017.10.27 at 22h 32m 58s.xml">
-      <configuration name="SportsMenDaoImplTest" configurationId="TestNG" />
+<<<<<<< Updated upstream
+    <history-entry file="SportEventDaoImplTest - 2017.10.27 at 23h 03m 18s.xml">
+      <configuration name="SportEventDaoImplTest" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest - 2017.10.27 at 22h 33m 31s.xml">
-      <configuration name="SportsMenDaoImplTest" configurationId="TestNG" />
+    <history-entry file="SportEventDaoImplTest - 2017.10.27 at 23h 03m 44s.xml">
+      <configuration name="SportEventDaoImplTest" configurationId="TestNG" />
     </history-entry>
+    <history-entry file="SportEventDaoImplTest_delete - 2017.10.27 at 23h 07m 53s.xml">
+      <configuration name="SportEventDaoImplTest.delete" configurationId="TestNG" />
+=======
     <history-entry file="SportsMenDaoImplTest - 2017.10.27 at 22h 33m 55s.xml">
       <configuration name="SportsMenDaoImplTest" configurationId="TestNG" />
+>>>>>>> Stashed changes
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest - 2017.10.27 at 22h 34m 35s.xml">
-      <configuration name="SportsMenDaoImplTest" configurationId="TestNG" />
+    <history-entry file="SportEventDaoImplTest_fail - 2017.10.27 at 23h 11m 18s.xml">
+      <configuration name="SportEventDaoImplTest.fail" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest_testAddToCompetition - 2017.10.27 at 22h 38m 11s.xml">
-      <configuration name="SportsMenDaoImplTest.testAddToCompetition" configurationId="TestNG" />
+    <history-entry file="SportEventDaoImplTest_fail - 2017.10.27 at 23h 11m 49s.xml">
+      <configuration name="SportEventDaoImplTest.fail" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest_testAddToCompetition - 2017.10.27 at 22h 38m 18s.xml">
-      <configuration name="SportsMenDaoImplTest.testAddToCompetition" configurationId="TestNG" />
+    <history-entry file="SportEventDaoImplTest_fail - 2017.10.27 at 23h 18m 48s.xml">
+      <configuration name="SportEventDaoImplTest.fail" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 22h 40m 02s.xml">
-      <configuration name="SportsMenDaoImplTest.testRemoveFromCompetition" configurationId="TestNG" />
+    <history-entry file="SportEventDaoImplTest_findAll - 2017.10.27 at 23h 05m 01s.xml">
+      <configuration name="SportEventDaoImplTest.findAll" configurationId="TestNG" />
+    </history-entry>
+    <history-entry file="SportEventDaoImplTest_findAll - 2017.10.27 at 23h 05m 46s.xml">
+      <configuration name="SportEventDaoImplTest.findAll" configurationId="TestNG" />
+    </history-entry>
+    <history-entry file="SportsMenDaoImplTest_testFindAll - 2017.10.27 at 22h 55m 32s.xml">
+      <configuration name="SportsMenDaoImplTest.testFindAll" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 22h 45m 03s.xml">
+    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 22h 49m 48s.xml">
       <configuration name="SportsMenDaoImplTest.testRemoveFromCompetition" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 22h 48m 52s.xml">
+    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 23h 25m 52s.xml">
       <configuration name="SportsMenDaoImplTest.testRemoveFromCompetition" configurationId="TestNG" />
     </history-entry>
-    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 22h 49m 48s.xml">
+    <history-entry file="SportsMenDaoImplTest_testRemoveFromCompetition - 2017.10.27 at 23h 26m 29s.xml">
       <configuration name="SportsMenDaoImplTest.testRemoveFromCompetition" configurationId="TestNG" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29812000" />
+<<<<<<< Updated upstream
+    <option name="totallyTimeSpent" value="31431000" />
+=======
+    <option name="totallyTimeSpent" value="29897000" />
+>>>>>>> Stashed changes
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="27" width="1920" height="1053" extended-state="6" />
@@ -1012,7 +1095,8 @@
     <MESSAGE value="project setting" />
     <MESSAGE value="merge + entity update" />
     <MESSAGE value="base test update" />
-    <option name="LAST_COMMIT_MESSAGE" value="base test update" />
+    <MESSAGE value="uprava uzivatele" />
+    <option name="LAST_COMMIT_MESSAGE" value="uprava uzivatele" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1024,12 +1108,11 @@
           <option name="timeStamp" value="8" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="13" />
+      <option name="time" value="14" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/entity/Competition.java" />
     <entry file="file://$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/services/CompetitionServiceImpl.java" />
     <entry file="file://$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/dao/UserDao.java" />
     <entry file="file://$PROJECT_DIR$/persistance/src/main/java/cz/muni/fi/pa165/dao/SportDao.java" />
@@ -1176,7 +1259,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
           <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1196,20 +1278,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="50" lean-forward="false" selection-start-line="7" selection-start-column="50" selection-end-line="7" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="10" column="87" lean-forward="false" selection-start-line="10" selection-start-column="87" selection-end-line="10" selection-end-column="87" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1242,20 +1310,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/BaseDaoImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/CompetitionDaoImplTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
           <caret line="24" column="21" lean-forward="false" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
+=======
+    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/BaseDaoImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+>>>>>>> Stashed changes
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1274,7 +1339,7 @@
     </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.11.RELEASE/spring-aop-4.3.11.RELEASE.jar!/org/springframework/aop/support/AopUtils.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="429">
+        <state relative-caret-position="2635">
           <caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
           <folding />
         </state>
@@ -1288,17 +1353,20 @@
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
+=======
     <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
+        <state relative-caret-position="476">
           <caret line="33" column="33" lean-forward="false" selection-start-line="33" selection-start-column="33" selection-end-line="33" selection-end-column="33" />
           <folding />
         </state>
       </provider>
     </entry>
+>>>>>>> Stashed changes
     <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportsMenDaoImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
+        <state relative-caret-position="323">
           <caret line="23" column="60" lean-forward="false" selection-start-line="23" selection-start-column="60" selection-end-line="23" selection-end-column="60" />
           <folding />
         </state>
@@ -1306,7 +1374,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Sport.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
+        <state relative-caret-position="153">
           <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1316,7 +1384,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/Competition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
+        <state relative-caret-position="595">
           <caret line="39" column="25" lean-forward="false" selection-start-line="39" selection-start-column="25" selection-end-line="39" selection-end-column="25" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1330,20 +1398,87 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/User.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="371">
+        <state relative-caret-position="1700">
           <caret line="142" column="5" lean-forward="false" selection-start-line="142" selection-start-column="5" selection-end-line="142" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/CompetitionDaoImplTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="24" column="21" lean-forward="false" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
-          <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+<<<<<<< Updated upstream
+        <state relative-caret-position="571">
+          <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
+=======
+        <state relative-caret-position="396">
+          <caret line="80" column="0" lean-forward="false" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="435">
+          <caret line="101" column="0" lean-forward="false" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" />
+=======
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="424">
+          <caret line="283" column="12" lean-forward="false" selection-start-line="283" selection-start-column="12" selection-end-line="283" selection-end-column="12" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/BaseDaoImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#548#549#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="486">
+          <caret line="60" column="9" lean-forward="true" selection-start-line="60" selection-start-column="9" selection-end-line="60" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java
new file mode 100644
index 0000000..87d8d17
--- /dev/null
+++ b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportEventDaoImplTest.java
@@ -0,0 +1,69 @@
+package cz.fi.muni.pa165.dao;
+
+import cz.fi.muni.pa165.entity.SportEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import java.util.Date;
+import java.util.List;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+public class SportEventDaoImplTest extends BaseDaoImplTest {
+
+    @Autowired
+    SportEventDao sportEventDao;
+
+    private SportEvent sportEvent1;
+    private SportEvent sportEvent2;
+
+    @BeforeMethod
+    public void createEvents() {
+        sportEvent1 = new SportEvent();
+        sportEvent1.setName("OH");
+        sportEvent1.setPlace("Monako");
+        sportEvent1.setDate(new Date());
+
+        sportEvent2 = new SportEvent();
+        sportEvent2.setName("MS");
+        sportEvent2.setPlace("USA");
+        sportEvent2.setDate(new Date());
+
+        sportEventDao.create(sportEvent1);
+        sportEventDao.create(sportEvent2);
+
+    }
+
+    @Test
+    public void findAll() {
+        List<SportEvent> all = sportEventDao.findAll();
+
+        assertThat(all.size() == 2);
+        assertThat(all.get(0).getName()).isEqualTo("OH");
+        assertThat(all.get(1).getName()).isEqualTo("MS");
+
+    }
+
+    @Test
+    public void delete() {
+        sportEventDao.delete(sportEvent2);
+
+        List<SportEvent> all = sportEventDao.findAll();
+        assertThat(all.size() == 1);
+        assertThat(all.get(0).getName()).isEqualTo("OH");
+
+        sportEventDao.delete(sportEvent1);
+        all = sportEventDao.findAll();
+        assertThat(all.size() == 0);
+    }
+
+    @Test
+    public void fail(){
+        SportEvent sportEvent = new SportEvent();
+        // hashcode returns NullPointerException
+        assertThatThrownBy(() -> sportEventDao.create(sportEvent))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+}
\ No newline at end of file