test validations, add about and terms and conditions pages under settings, fix for car.make.make, work in progress in add refuel, new page to suggest new make and model
fix conflicts with merge from @neggro
Merge branch 'neggro-master'