Merge pull request #1 from pb66/processlist

Processlist
Merge pull request #2 from emoncms/master

updated from upstream
#200

When index.php outputs JSON encoded data, the content type is set to to
'application/json’.
Merge pull request #201 from kanflo/master

#200
Removed database password contents check
added explanation and options for password reset
Addition of two info logs and time for node can be set from input data
Merge remote-tracking branch 'origin/master' into Develop
Merge pull request #208 from emoncms/Develop

Improved logging and seperation of npoints metadata
Update index.php
Merge pull request #207 from pb66/enable_password_reset

Enable password reset setting
Merge pull request #204 from inverse/password-check-rem

Removed database password contents check
Update index.php
Merge branch 'master' of https://github.com/emoncms/emoncms into organisations
keep phpmailer settings in dsefault settings

Conflicts:
	default.settings.php
	index.php