upgrade to rails4
update mass
refactoring
resove conflic