Nodejs Web Admin: add Hype logo
Nodejs Web Admin: add more safety to config saving
Refactor to have ConfigFile class
Changed all instances of CJDNS (in readme-s, comments etc., not in variable names) to lowercase.
cjdlua: Add conf saving, multiline comment support, and test script
Merge branch 'master' into cjdlua
Merge pull request #256 from campadrenalin/cjdlua

Another cjdlua pull request
Merge pull request #257 from ciubotaru/lowercase

Changed all instances of the word 'CJDNS' (in readme-s, comments etc.) to lowercase.
Nodejs Web Admin: update admin methods selection
Nodejs Web Admin: switch config parsing to eval

Because config file is not really JSON, it's JS-file with comments, etc.
Nodejs Web Admin: up version
Merge branch 'master' of git://github.com/cjdelisle/cjdns into cjdelisle-master

Conflicts:
	contrib/nodejs/admin/package.json
	contrib/nodejs/admin/www/config.html
	contrib/nodejs/admin/www/index.html
	contrib/nodejs/admin/www/logs.html
	contrib/nodejs/admin/www/map.html
Nodejs Web Admin: add navbar link:hover style
Merge pull request #261 from norlin/master

Update Nodejs Web Admin
added my Ubuntu packaging
Merge pull request #263 from Shnatsel/deb-packaging

Add Ubuntu packaging for daily builds
Removed echo calls that I was using for debugging

How did i not catch this earlier
Merge pull request #264 from thefinn93/patch-1

Stupid issue with the PHP interface