diff --git a/NFCServer.iml b/NFCServer.iml
index 8a19ba5..b8be68a 100644
--- a/NFCServer.iml
+++ b/NFCServer.iml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="D:\NFCapp_SERVER" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="web" name="Web Gradle : nfc_server-0.1.0.war">
-      <configuration>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
     <facet type="Spring" name="Spring">
       <configuration>
         <fileset id="fileset" name="Spring Application Context" removed="false">
@@ -29,6 +18,17 @@
         <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
       </configuration>
     </facet>
+    <facet type="web" name="Web Gradle : nfc_server-0.1.0.war">
+      <configuration>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/src/main/java" />
+        </sourceRoots>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
@@ -91,10 +91,6 @@
     <orderEntry type="library" exported="" name="Gradle: spring-data-commons-1.7.1.RELEASE" level="project" />
     <orderEntry type="library" exported="" name="Gradle: spring-data-jpa-1.5.1.RELEASE" level="project" />
     <orderEntry type="library" exported="" name="Gradle: spring-aspects-4.0.3.RELEASE" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: tomcat-embed-core-7.0.52" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: tomcat-embed-el-7.0.52" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: tomcat-embed-logging-juli-7.0.52" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: spring-boot-starter-tomcat-1.0.0.RELEASE" level="project" />
     <orderEntry type="library" exported="" name="Gradle: spring-web-4.0.3.RELEASE" level="project" />
     <orderEntry type="library" exported="" name="Gradle: spring-webmvc-4.0.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: jstl-1.2" level="project" />
@@ -106,6 +102,10 @@
     <orderEntry type="library" scope="TEST" name="Gradle: mockito-core-1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: hamcrest-library-1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: spring-test-4.0.3.RELEASE" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: tomcat-embed-core-7.0.52" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: tomcat-embed-el-7.0.52" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: tomcat-embed-logging-juli-7.0.52" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: spring-boot-starter-tomcat-1.0.0.RELEASE" level="project" />
   </component>
 </module>
 
diff --git a/build.gradle b/build.gradle
index 7cec1f0..6c96dff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,6 +40,6 @@ dependencies {
     providedRuntime("javax.servlet:jstl")
 
     /*Potrzebne do mapowanie widokow jsp, u*/
-    /*providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
-    providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")*/
+//    providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
+//    providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")
 }
\ No newline at end of file
diff --git a/src/main/java/application/controllers/RoleController.java b/src/main/java/application/controllers/RoleController.java
index 6124c4a..d182b97 100644
--- a/src/main/java/application/controllers/RoleController.java
+++ b/src/main/java/application/controllers/RoleController.java
@@ -28,6 +28,16 @@ public class RoleController {
         roleRepository.save(role);
     }
 
+    @RequestMapping(value = "/addSampleRoles")
+    @ResponseBody
+    public String addSampleRoles() {
+        roleRepository.save(new Role("CLEANER", "shityJob"));
+        roleRepository.save(new Role("BOSS", "fuckYea"));
+        roleRepository.save(new Role("SECURITY", "ochroniarzPatryk"));
+
+        return "roles added";
+    }
+
     @RequestMapping("/{roleId}")
     @ResponseBody
     public String getRole(@PathVariable("roleId") Long roleId) throws JSONException{
@@ -49,7 +59,6 @@ public class RoleController {
         JSONArray roleArray = new JSONArray();
         for (Role role : roleRepository.findAll()) {
             JSONObject roleJSON = new JSONObject();
-            roleJSON.put("id", role.getRoleId());
             roleJSON.put("role", role.getRoleName());
             roleJSON.put("password", role.getPassword());
             roleArray.put(roleJSON);
@@ -57,6 +66,25 @@ public class RoleController {
         return roleArray.toString();
     }
 
+    @RequestMapping("/getRoles")
+    public
+    @ResponseBody
+    String getRoles() throws JSONException {
+        JSONObject accessCodes = new JSONObject();
+        accessCodes.put("success",true);
+
+        JSONArray roleArray = new JSONArray();
+        for (Role role : roleRepository.findAll()) {
+            JSONObject roleJSON = new JSONObject();
+            roleJSON.put("role", role.getRoleName());
+            roleJSON.put("password", role.getPassword());
+            roleArray.put(roleJSON);
+        }
+        accessCodes.put("accessCodes", roleArray);
+
+        return accessCodes.toString();
+    }
+
     @RequestMapping("/remove/{roleId}")
     public String removeRole(@PathVariable("roleId") Long roleId) {
         roleRepository.delete(roleId);
diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java
index caf5fba..d5794e7 100644
--- a/src/main/java/application/controllers/UserController.java
+++ b/src/main/java/application/controllers/UserController.java
@@ -61,6 +61,7 @@ public class UserController {
                 //access codes
                 JSONArray accessCodes = new JSONArray();
 
+
                 //message
                 JSONObject message = new JSONObject();
 
@@ -89,6 +90,7 @@ public class UserController {
     @ResponseBody
     public String addMe() {
         User marcin = new User("Marcin", "Michalek", "marcin.marcim@gmail.com", "pass");
+
         userRepository.save(marcin);
 
         return "User created" + marcin.getUserId();