fixed small bug
Fix nconf.file not really using config file
Added log message about where configuration is being loaded from
Merge pull request #1042 from miksago/config-file-fix

Fix configFile option handling
check err firsT
closes #1012
Hungarian, Norwegian, and Polish translation strings updated from Tx
fixed js error in composer
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
fixing template in favourites.tpl
Merge branch 'master' of github.com:designcreateplay/NodeBB
check if tids and uids array array before calling async
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
removing console.log
added global loggedIn to templates'
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
closes #992
reverse infinite loading
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
possible fix for #1050