Active admin conflict
fix problem
Added Show Page
Merge branch 'master' of github.com:Akashbarik/hack
Fix am
Added public Portal
Merge branch 'master' of github.com:Akashbarik/hack