fixed specs and merged with rails4 on develop