add
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/api/v1/NightsController.php