Merge branch 'master' of http://github.com/knpuniversity/oauth
Merge branch 'master' of http://github.com/knpuniversity/oauth
Merge branch 'feature/login-7' into feature/farm-14
rebrands the house website to 'The Coop'
changes header to BootsWatch with link to the theme
add user_id to the client, and show user-specific clients on the client page
adds 'eggs' and 'chickens' API actions and messages. cleans up some of the linkage/flow as well
better deliniation between 'my apis' and 'another users apis'
makes APIs data-driven
adds Collect Eggs command (see app/console)
results of php-cs-fixer
moves cron command into its own project
changes all twig templates that were 2-spaces to 4-spaces
Merge branch 'master' of http://github.com/knpuniversity/oauth
resolving conflict in UserManangement
removing unneeded dependencies in cron/composer.json
Merge pull request #18 from bshaffer/feature/farm-14

Update House to Farm