committing to pull changelog from github
Merge branch 'master' of https://github.com/adminion/adminion

Conflicts:
	README.md