Copied build.sbt as template. First view version.
Merge branch 'iCal-parser' of https://github.com/mcprok/timelineWidget into iCal-parser

Conflicts:
	app/controllers/Application.scala
	conf/routes
Merge branch 'iCal-parser' of https://github.com/mcprok/timelineWidget into iCal-parser

Conflicts:
	app/controllers/Application.scala
	conf/routes
Merge branch 'iCal-parser' of https://github.com/mcprok/timelineWidget into iCal-parser

Conflicts:
	app/controllers/Application.scala
	app/views/fileUpload.scala.html