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
Merge branch 'phpcs_user_model'