updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/lib/models.js
	api/routes/account.js