play 2.1.1
merged

Conflicts:
	RSSFeed/app/controllers/Application.scala
	RSSFeed/app/views/index.scala.html
	RSSFeed/conf/application.conf
	RSSFeed/conf/routes
	RSSFeed/project/Build.scala
	RSSFeed/project/plugins.sbt
xml kram