removed code climate badge until analysis is complete
messaging jshint
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
Merge branch 'master' of github.com:designcreateplay/NodeBB
fixed apple-touch-icon for subfolder installs
fixing #1177
removed removeHiddenFields function, using mongo selector instead
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
return user object
temporarily removing cronjob until upstream bugs are fixed -- resolved #1178
Merge branch 'master' of github.com:designcreateplay/NodeBB
closes #1180
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Conflicts:
	app.js
	public/templates/category.tpl
	public/templates/popular.tpl
	public/templates/recent.tpl
	public/templates/unread.tpl
	src/routes/plugins.js
	src/webserver.js