some changes
some changes
commit before ActiveAdmin
remove some useless files
some changes
merge