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
 fixed
fix
change to passive mode [#1749]
sneaky second connection [#1749]
bump version before deploying
fix deprecated syntax on find_or_create_* [#499]
bump version
fix deprecations and creation
[#231] Fix railtie to show existing install generator in Rails