Remy Sharp 7ab1d07f88 Merge branch 'master' into feature/ssl-login ...

The joys of merge conflict resolution. Fuck yeah.

Conflicts:
	config.default.json
	lib/db/mysql.js
	lib/features.js
	lib/handlers/bin.js
	lib/handlers/session.js
	package.json
	public/css/style.css
	public/custom/emberjs/default.html
	public/js/chrome/navigation.js
	public/js/editors/keycontrol.js
	public/js/editors/panel.js
	views/index.html

2014-02-17 10:39:53 +00:00

..

bin.js

Missed one of the damn handlers for url length

2014-02-16 18:25:09 +00:00

forgot_token.js

ForgotTokenModel#createToken() returns token

2012-06-24 21:04:53 +01:00

index.js

Changed models index to return cached models

2014-02-08 23:51:27 +00:00

user.js

Renaming metrics_prefix to metricsPrefix

2014-01-27 13:08:40 +00:00