fixed merge
fixed merge
wspurgin/activeadmin,waymondo/active_admin,SoftSwiss/active_admin,activeadmin/activeadmin,SoftSwiss/active_admin,varyonic/activeadmin,deivid-rodriguez/activeadmin,maysam/activeadmin,mauriciopasquier/active_admin,javierjulio/activeadmin,siutin/activeadmin,cmunozgar/activeadmin,vraravam/activeadmin,javierjulio/activeadmin,activeadmin/activeadmin,waymondo/active_admin,mauriciopasquier/active_admin,waymondo/active_admin,wspurgin/activeadmin,vraravam/activeadmin,deivid-rodriguez/activeadmin,vytenis-s/activeadmin,cmunozgar/activeadmin,gogovan/activeadmin,mrjman/activeadmin,siutin/activeadmin,mrjman/activeadmin,vytenis-s/activeadmin,javierjulio/activeadmin,activeadmin/activeadmin,maysam/activeadmin,gogovan/activeadmin,varyonic/activeadmin,maysam/activeadmin,mauriciopasquier/active_admin,wspurgin/activeadmin,mrjman/activeadmin,gogovan/activeadmin,SoftSwiss/active_admin,cmunozgar/activeadmin,vytenis-s/activeadmin,varyonic/activeadmin,siutin/activeadmin,deivid-rodriguez/activeadmin,vraravam/activeadmin