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

# Conflicts:
#	services/build.gradle

persistence/build.gradle

@@ -3,9 +3,6 @@ plugins {
     id 'java'
 }
 
-apply plugin: 'io.spring.dependency-management'
-apply plugin: 'org.springframework.boot'
-
 description = 'Provides database access and connectivity'
 group 'edu.msudenver.tsp'
 version '1.0'

persistence/scripts/mysql/local_development.sql

@@ -16,7 +16,6 @@ values ('admin', 'secret', true),
 ('BrittanyBi', 'secret', true),
 ('lanlanzeliu', 'secret', true),
 ('tramanh305', 'secret', true);
-
 create table definitions (
 id int not null auto_increment primary key unique,
 name varchar(200) not null,