Testdev changes
Fixed the functions
Merge remote-tracking branch 'origin/ericdev'
Fixed Merge conflict
Added newfile.php to do new stuff