Merge remote-tracking branch 'akrabat/dbgen_duration'
Merge branch 'master' of GitHub:joindin/joindin-api
Merge branch 'master' of GitHub:joindin/joindin-api
adding a slug parameter to the events collection to fetch just the event with that slug
search events by title
Add an explicit version property to Request as it's set in index.php anyway.
Allow logging in using the OAuth password grant.

This is an initial commit. Tidy up required.
Add configuration

The config.php file is a sibling to database.php and currently holds the
list of client ids that we allow to authenticate with the password grant
type.
Refactor createAccessTokenFromPassword()

Split up what it does into separate methods and also tidy up some
whitespace issue in this file.
making the full name field optional, this can happen when a user signs in with some other social network
Merge pull request #27 from lornajane/full-name-fails-test

Fix the test that expects full name to be populated
Handle case when stub doesn't exist
Handle when no events match the given title filter, pass in required and optional parameters
Merge branch 'dstockto-JOINDIN-346'
Merge branch 'master' of GitHub:joindin/joindin-api into dstockto-JOINDIN-277-events

Conflicts:
	src/controllers/EventsController.php
	src/models/EventMapper.php
adding some friendlier error messages when required fields are missing
allow users to log in on more than one device
Merge branch 'akrabat-web2-login'