Changed User.create signature to accept a hash, added a couple of utility functions as well
Merge remote-tracking branch 'upstream/master'
added "trust proxy" config option with default to true
Merge remote-tracking branch 'upstream/master'
password should be passed to action hook, and it was being ovewritten
removing couple of console.log
Changed to bcrypt.js
closes #856
Update login.js
Update comment
Added Finnish language translation
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master

Conflicts:
	src/user.js
removed tests from acp
adding xregexp to ACP header
topics should be marked read correctly if you are already in it
support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden
Merge branch 'master' of github.com:designcreateplay/NodeBB
added getObjectKeys for julian :)
and for andrew
send app to action:app.load