upgrading to rails 4
updated database work
updated with hour editability, fixed some other things, upgraded to rails 4