..
fixed : conflicts
 added : ...
removed : assets
added : new activeadmin