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

# Conflicts:
#	services/build.gradle

src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java

@@ -2,7 +2,6 @@ package edu.msudenver.tsp.website.controller;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -12,7 +11,7 @@ import static org.junit.Assert.assertNotNull;
 @RunWith(MockitoJUnitRunner.class)
 public class TheoremEntryControllerTest {
 
-    @Mock private TheoremEntryController theoremEntryController;
+    private final TheoremEntryController theoremEntryController = new TheoremEntryController();
 
     @Test
     public void testEnterTheoremPage() {