Merge branch 'develop' into release/1.3.1
Merge branch 'develop' into release/2.0
Merge branch 'release/2.0'
Code typos in readme
Merge pull request #150 from guywarner/patch-1

Code typos in readme
Merge pull request #172 from burzum/develop

Working on the documentation
Merge branch 'master' into develop
Merge branch 'master' of github.com:CakeDC/users into develop

Conflicts:
	readme.md
Merge branch 'develop' of github.com:CakeDC/users into develop
Changing .travis and updating composer.json