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

# Conflicts:
#	services/src/integrationTest/resources/test.properties
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java

persistence/scripts/mysql/local_development.sql

@@ -5,11 +5,11 @@ create table accounts (
 id int not null auto_increment primary key unique,
 username varchar(50) not null unique,
 password varchar(256) not null,
-administrator_status boolean default false,
+administrator boolean default false,
 last_login date,
 version int default 1
 );
-insert into accounts (username, password, administrator_status)
+insert into accounts (username, password, administrator)
 values ('admin', 'secret', true),
 ('atusa', 'secret', true),
 ('dantanxiaotian', 'secret', true),