Tidy up
Further Tidy up
Further Tidy up
Removed ~ backup files
Fixed library require_once issues.
Removed extra map link
Naming error...
Merge branch 'master' into testing

Master updated to lasted stable test.