[#1864] Kavitha/John - Enquiries can now be filtered by the match_updated_at field.
[#1864] Kavitha/John - Enquiries api index now returns a list of resource urls.
new step file for enquiries added
new scenarios added to create_or_edit_enquiry.feature
Added images needed for documentation of Android IDE setup
Merge pull request #582 from gsluthra/ImagesForAndroidSetup

Added images needed for documentation of Android IDE setup
[#1875] Kavitha/John - Generalised handling of JSON parsing exceptions.
[#1875] Kavitha/John - Generalised handling of JSON parsing exceptions.
Pulled changes from upstream repo
Merge pull request #583 from johncowie/master

[#1864/1875] Enquiries api now returns a list of resources, and json parser handling has been generlised across controllers.
[#1871] Kisitu/Faris - FIxed merge conflicts.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	Gemfile
	app/controllers/api/enquiries_controller.rb
	app/models/enquiry.rb
	spec/controllers/api/enquiries_controller_spec.rb
	spec/models/enquiry_spec.rb