Akash - #1287/#1575 - initial work for generating and triggering a report
[#1540] Faris : removed test in export_child_photo_wall.feature
MJ: merge changes
MJ:merge
Faris/Akash - #1287 - added ftr status as seed data and removed hard coded strings in report generator
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	app/models/field.rb
Merge pull request #358 from akash/master

#1287 and #1575 - added weekly report generation
Bruce - adding style for error message in advanced-search page
Merge remote-tracking branch 'origin/master'
Remo/MJ : Completed #1588 Reverting work on #1246
The save & discard buttons should be aligned to the right story#1590
#1590 - Alabê Duarte - Align the save & discard buttons to the left
Faris/Akash - ignoring reports dir
Merge pull request #364 from akash/master

Faris/Akash - removed (and ignored) reports in reports dir
Merge pull request #365 from akash/master

Faris/Akash - #1287 - added test for report generation
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Faris/Akash - #1287 - added test for report generation
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #366 from akash/master

merge
Merge branch 'master' of git://github.com/rapidftr/RapidFTR