added active admin
fix conflicts
Merge pull request #7 from mansoorelahi/shwetha

added active admin