advanced schedule date
merge
merging SWING changes
change PW for database
merge from github