intall active admin
Merge branch 'master' of https://github.com/mrjusepelo/hoke_dev

Conflicts:
	.gitignore
admin