autocomplete
Merge branch 'master' of https://github.com/tikalk/fuse-dec13-play

Conflicts:
	app/controllers/Application.scala
Merge branch 'master' of https://github.com/tikalk/fuse-dec13-play

Conflicts:
	app/controllers/Application.scala