bug 1822
Akash - 1821 - not showing export link on ll children page when user doesn't have permissions
Akash - fixing add_custom_field feature
ci | Subhas | Add vendor/cache to gitignore
Akash - fixing merge screw ups with export functionality
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #523 from akash/master

fixed issues caused by (my) dodgy merges last night
Akash - #1717 - fixing permissions for export to cpims
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #524 from akash/master

Akash - #1717 - fixing permissions for export to cpims
Update CPIMS gem to latest version
Upgrade CPIMS version
Upgrade CPIMS version
Akash - 1821 - ensuring log entries are displayed in order
Merge pull request #528 from akash/master

Akash - 1821 - ensuring log entries are displayed in order
Merge pull request #514 from LiKethoughtworks/bugfix/1822-password-and-reenter-password-field-should-hava-asterix

fix bug 1822
1806 | Subhas/Viky | First round of fixes, most Rspecs are passing
1806 | Subhas/Viky | Most headless cukes passing
1806 | Subhas/Viky | Most browser cukes passing
1806 | Subhas/Viky | Removed unnecessary gems, Upgraded to rails 3.0.20