Retrait du DS_STORE

Retrait du DS_STORE
Merge branch 'master' of https://github.com/josealbea/FBAppBTA

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/josealbea/FBAppBTA
Merge branch 'master' of https://github.com/josealbea/FBAppBTA
Merge branch 'master' of https://github.com/josealbea/FBAppBTA
Merge branch 'master' of https://github.com/josealbea/FBAppBTA
Reset personnel

Reset du dossier personnel
Merge branch 'master' of https://github.com/josealbea/FBAppBTA

Conflicts:
	application/conf.php