basic rails 4 project with TB, devise and simple_form
merge conflict fixed