Bugfix to getLastEdited API method, issue #845
Merge pull request #846 from jhollinger/master

Fix getLastEdited API method
Merge pull request #864 from Pita/develop

Merge bugfixes
fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled
fix issue #955: upd resolve library to 0.2.3
use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues
Merge pull request #961 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues-rebased-onto-master

Fix ie8 native xmlhttp support disabled issues rebased onto master
Update README.md

npm cache clean jshint was the only way to get jshint installed correctly again..
Update README.md: node download links and versions 

node downloads corrected links and preferred versions
Merge pull request #969 from rasos/patch-1

Update README.md
error handling and close is removed in express 3
attempt to put correct init in right place but could be wrong
Resolve merge conflicts

Conflicts:
	README.md
Add `userColor` query param to set initial color

Add a URL parameter which sets the initial color for a user, e.g.:

    http://example.com/p/mypad?userColor=%2300ff00

Sanitize the given color value to ensure that it's a valid css value
(could be any supported CSS color format -- #fff, rgba(), "red", etc).

Shortly after rejoining a pad, the server responds with a USER_NEWINFO
message which may contain an old color value; however, this message
arrives after we have set and sent the new color value to the server.
To avoid this race condition, if the query parameter has been set,
ignore the color value in a USER_NEWINFO message which matches our user
ID.
Use 'transparent' as reference to validate css

Use 'transparent' instead of 'white' as a reference color for validating
CSS color values.  Presumably, a user setting a userColor wants some
color other than 'transparent' if they are setting it (they could always
duplicate the background's color if not).
Require userColor to be valid css hex

The utility functions colorutils.js assume that background colors are in
CSS hex format, so require userColor to do the same, rather than
allowing inputs like "red" and "rgba(...)", to insure that inversion
checks will succeed.
Differentiate between http server and express app
Upgrade log4js to v0.5
Upgrade to Yajsml with another Windows backslash fix.
Consolidate Ace2Editor frame's boot script.