format
jsRoutes
jsRoutes
add new projects
add project
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/ApplicationController.scala
changed direction
changed direction
Merge remote-tracking branch 'upstream/master'