[CI] removed deploy:nginx task from default execution temporarily as the DNS entries are hard coded in the server to accomodate both DNS and ip address server matches until allt he servers have the DNS entries.
Merge pull request #329 from farismosman/master

[#1509] Language Translation : Defects related to story #1212
#1225 Ashok|Kavitha - Added properties inlieu of supported languages to the Field model
#1225 Ashok|Kavitha - Added module to localise properties of formSections and forms
#1225 - Ashok/Kavitha - Added fall back for properties if the translation is not available in the given locale
#1225 - Kavitha/Ashok - Changed the locale in test from de to fr
#1225 - Kavitha/Ashok - Moved the locales to application.rb
#1225 Ashok|Kavitha Added Web UI for translations
#1225 Ashok|Kavitha - Building formatted hash in lieu of translations and converted to json
#1225 - Ashok/kavitha - Fixed some of automation specs
#1225 - Ashok/Kavitha - Added migration for existing form_sections
#1225 Ashok|Kavitha - Added a partial for adding translations of form sections and fields
1280 | Subhas/Akash | Added page for listing, adding and deleting replications
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
#1318 -Suganthi - Added one missed out translation
#1511 - Yekkanti/Suganthi - Modified sunspot.rake to run the app in windows
1280 | Subhas | Added factory_girl and extra specs
1280 | Subhas | Ask only target RapidFTR URL instead of CouchDB details
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
1280 | Subhas | Added more tests, edit page and timestamp