modified scenario:Uploading multiple images along with audio file
1718 | Subhas/Viky | Added ExportTask implementations for Pdf/Photowall/CSV which simply delegate to ExportGenerator
1718 | Subhas/Viky | Integrated Export Task addons with Export All functionality
1718 | Subhas/Viky | Converted all Export buttons to use ExportTask implementations
1802 | Subhas/Viky | Minor fix in path names
merged feature file related to user
[#1821] Akash/Faris : moved current_formatted_time from child to RapidFTR::CLock
1718 | Subhas/Viky | Fix all unit tests
1718 | Subhas/Viky | Fix cucumber tests
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
1718 | Subhas | Encrypted zip file must not use subfolders inside the zip
1718 | Subhas/Viky | Cleanup all files inside temporary cleanup folder
1802 | Subhas/Viky | Some seed data not having all translations
1668 | Subhas/Viky | Fix bug: Convoy # field not accepting special character
Faris/Akash - #1821 - added controller for viewing log entries
Merge branch 'master' of git://github.com/rdsubhas/RapidFTR into pull-req-508
Merge branch 'pull-req-508'
Merge pull request #508 from rdsubhas/master

1718 | Subhas | CPIMS Export Functionality
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Pin Ruby version to make it obvious when someone has the wrong version.