Merge branch 'frontend' into backend
fixed untracked files
Merge branch 'backend' of https://github.com/pastillApp/pastillApp-web into backend
...
Merge branch 'frontend' into backend

Conflicts:
	app/controllers/Managers.scala
Merge branch 'backend' into frontend