Update announce
Merge branch 'master' of https://github.com/NiceMarket/BasketballClub

Conflicts:
	config.json
	controllers/application.js
	controllers/database.js
	public/assets/js/facebook.js