Adding KAP template to the survey module
And some bug fixes.
Minor cleanups
Merge branch 'master' of git://github.com/graeme-f/eden
Enable KAP survey in IFRC template