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