Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16

# Conflicts:
#	services/build.gradle

src/main/webapp/WEB-INF/jsp/success.jsp

@@ -1,7 +1,7 @@
 <html>
-<body>
-<br><b>Name:</b><%= request.getParameter("theoremName1")%>
-<br><b>Name:</b><%= request.getParameter("theoremName2")%>
+    <body>
+        <br><b>Name: </b><%= request.getParameter("theoremName")%>
+        <br><b>Theorem: </b><%= request.getParameter("theorem")%>
 
-</body>
+    </body>
 </html>