Merge branch 'master' into reactor

Conflicts:
	plugins/chrome-webjournal/popup.html
Dan's notes on server reactor implementation
Skeleton reactor code
Core reactor code written, delegates HTTP calls to handlers
Call handlers from reactor
Added headers and arguments to reactor request
Sessions/tokens better support - can login, access data
Match wildcard mappings - fixes GET/PUT/POST
Merge branch 'unstable' into reactor

Conflicts:
	lib/indx/webserver/handlers/base.py
	plugins/chrome-webjournal/popup.html
New 'action' ('http') for websockets which maps to the webserver
Single session websocket http calls now work, e.g.:

store.getBox("react1").then(function(box){ window.tbox = box });

tbox._ws.send('{"action": "http", "request": {"method": "GET", "path":
"/react1/get_object_ids", "params": {"headers": {"Accept": "*/*"},
"args": {"box": ["react1"], "app": ["websocket"], "token":
["a25da114-d152-11e3-b87a-28cfe918cb1f"]}}, "content": ""} }')
Pass in 'requestid' in a websocket http request and it is returned
Merge branch 'reactor' into unstable