updated routes to rails 4
merge some other code