Faris : Fixed conflicts.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
#1833 - Ponnu/Shiva - Fixed the defect
Akash - #1803 - adding new dob field to forms
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #539 from Sivasu/master

1833 | Siva/Ponnu | Fix defect - When a text field is added the value under options shows [] instead of blank space
Akash #1803 - horrible hack to get tests to pass with new migration
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1652] Faris : Cleaned up the error messages in models.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Akash - #1803 - fixing date of separation field in form sections to be a datefield
Merge pull request #544 from akash/master

#1803 - replacing dates in form sections with actual date fields