Gathering Control works
Merge branch 'master' of https://github.com/TweetAggregator/TweetAggregator

Conflicts:
	app/controllers/Gathering.scala
	conf/routes