Changes for Javascript best practices
Deleted old js files
Javascript best practices
Removed duplicates in find_add.php
Removed duplicates in find_add.php
Fixed merge conflict
Removed email client option
Deleted action handler for merge client
Changed color of button
Updated Documentation.txt to reflect branching
Updated scripts for server