commit initial
Merge branch 'master' of https://github.com/yellowme/adminbase

Conflicts:
	.gitignore