Merge branch 'feature/con104' into develop
Rake task WIP [#106]
adding scopes for model Vehicle [#105]
adding scope for vehicle model and Function called makes [#105]
Updated Rake task [#106]
Finished update rake tasks [#106]
Merge branch 'feature/con106' into develop
Merge branch 'develop' into feature/con105

Conflicts:
	lib/glassguide/vehicle.rb
Fixed Models, and added rspecs [#106]
Merge branch 'feature/con105' into develop
Merge branch 'release/2014_04_03-1'
Fixed photo uploads and function
fixed json
fixed json
fixed json
Added extra scope to toggle vehicle or motor cycle
Added Rescue
Updated deprication_table
fixed deprication table
fixed