for active admin
Merge branch 'userPages' of github.com:Twie/Writetest into userPages
merging