Merge commit 'cfd3f2d2045e032569c8734c80404b60521fb210'
Changed run environment to compile on demand
Merge commit 'bdaad2c10203c3d150e89965503d4e6fe4a229fb'

Conflicts:
	server.js
Merge commit 'bd7b795e4260099559cd97bcaf25bcc52fc13963'
Merge commit '98ae04209a512e341a7a54465ff0427b58470ff2'
Merge commit 'e6e5f0e48410ece1bca3914d7c79a18234177af6'
temp graph removal Merge commit '6dbc0bc62c9680a2edd21cc67a9f52dd29e23d66'
Added flot Merge commit '63373b4c1bd414931a831e5ee7fce5b55d9d4b2b'
Log callback Merge commit '3611d9610a63167f06aa9783c7bfea5a3bbc792a'
fixed merge conflict