Automation around Chinese translations
Features folder deleted
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
Unnecessary files related to users deleted
Files related to users merged and refactored
Merge branch 'master' into merge_user_related_files
Merge branch 'master' of https://github.com/rapidftr/RapidFTR into merge_user_related_files
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
add a new file.
merge feature files.
delete unnecessary files.
merge feature files related to forms
resolve a conflict in the login_steps.rb
update feature test
delete unnecessary files.
Child's Wishes needs an apostrophe.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR