Rails3.2

merge branches with mitfik