Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15

# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java

services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java

@@ -38,7 +38,7 @@ public class UserServiceIntegrationTest {
         assertEquals("test password", returnedAccount.getPassword());
         assertFalse(returnedAccount.isAdministratorStatus());
 
-        final Optional<Account> updatePasswordTestCreatedAccount = userService.updatePassword(returnedAccount, "password");
+        final Optional<Account> updatePasswordTestCreatedAccount = userService.updateAccount(returnedAccount);
 
         assertTrue(updatePasswordTestCreatedAccount.isPresent());
         final Account returnedUpdatedPasswordAccount = updatePasswordTestCreatedAccount.get();

services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java

@@ -17,9 +17,6 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.when;
 
-
-
-
 @RunWith(MockitoJUnitRunner.class)
 public class UserServiceTest {
     @Mock