Added jquery file and new database configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/includes/header.php