Big commit due to loss of previous small commits. Updated controllers, i...

...ncluded view forms, updated schema, added factory_girl factories with booking, updated routes and views