facebook fix
Merge branch 'development' of https://github.com/Mauricevb/42IN07SOb into development

Conflicts:
	js/config.js
Merge branch 'development' of https://github.com/Mauricevb/42IN07SOb into development