users profile page, need to add templates
duhsign for category home page
removed some console.log
removed get_username_by_uid, use getUserField(uid,'username',callback) directly
added template mapping, did users->account
Merge branch 'master' of https://github.com/psychobunny/NodeBB

Conflicts:
	src/webserver.js
forgot templates config
added links to user profiles from posts and the breadcrumbs
fixed header to link to new users page
finished recent, popular and active posts shells, just need to update api methods
Merge branch 'master' of https://github.com/psychobunny/NodeBB
Merge branch 'master' of https://github.com/psychobunny/node-forum
topic locking and deletion
Merge remote-tracking branch 'origin' into thread_options

Conflicts:
	public/src/templates.js
what i have
fixed custom_mapping bug
temporary fix for templates loading twice
Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
fixed socket notifications for new posts
fixing socket returns to emit to everybody in the room (on thread locking/deletion)