Merge remote-tracking branch 'dstockto/cs_user_model' into phpcs_user_model
Merge branch 'master' of git://github.com/joindin/joind.in into phpcs_user_model
modifying api v1 user/getdetail to only accept user_id rather than guessing whether something is a username or user_id
Updated the joindIn jQuery plugin to enable a bit more map control and feedback, and
replaced the the google map and address lookup with OSM.
Reorganised the init code for the map.
Added reference URLs
Bug 275 - Add session duration (optional)
Bug 275: added duration to API v2 results
Refactor the \Request class public $verb property to protected and users to use the getter.
JOINDIN-286 - Search date picker month not very clear

Darkened date picker title to make it easy to read
Modify slides <a> tag in _talk_detail view to open in new window/tab
Added changing base_url and api_base_url in config.php to vagrant setup instructions
updating the access token for the API docs, this one exists on live so will get copied over
Merge pull request #727 from Eli-TW/doc_fix_for_base_url_in_config

Added changing base_url and api_base_url in config.php to vagrant setup ...
Merge branch 'phpcs_user_model'
removing the last logged in information from the API output
Merge remote-tracking branch 'gargoyle/JOINDIN-269'
Merge remote-tracking branch 'tocacar/master'
Merge remote-tracking branch 'dstockto/JOINDIN-286'
Merge remote-tracking branch 'stevecoug/bug275' into session-duration

Conflicts:
	doc/db/patch38.sql