Merging

Mergie merge merge
Merge branch 'develop' of https://github.com/pnchappy92/nBB into develop

Conflicts:
	controllers/main.js
	server.js