index
Merge branch 'master' of https://github.com/LahmerGoblin/NewsMinerProto

Conflicts:
	RSSFeed/app/views/index.scala.html

+ index in userprofile umbenannt