changed url encoding for make_feature_branch script
Merge branch 'master' of github.com:frontlinesms/frontlinesms2
Merge branch 'master' of github.com:frontlinesms/frontlinesms2
added line to remove the an extra file created
added line to ensure user enters an argument which is the branch name
added line to clean untracked unwanted file
modification on the command that removes the unwanted untracked file
modification on the command that removes the unwanted untracked file
modification on the command that removes the unwanted untracked file
Merge branch 'master' into CORE-1104

Conflicts:

	plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy
	plugins/frontlinesms-core/do/js_unit_test_xml
	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy
	plugins/frontlinesms-core/grails-app/i18n/messages.properties
	plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy
	plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy
	plugins/frontlinesms-core/grails-app/views/contact/_contact_list.gsp
	plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy
	plugins/frontlinesms-core/test/integration/frontlinesms2/domain/PollISpec.groovy
	plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy
Merge branch 'master' into CORE-1104
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104

Conflicts:

	plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp
	plugins/frontlinesms-core/grails-app/views/activity/customactivity/_step_summary.gsp
	plugins/frontlinesms-core/web-app/js/activity/custom_activity.js
updated do/make_feature_branch
removed annoying whitespace in bash script
resolved merged conflict of master into CORE-1104

Conflicts:

	plugins/frontlinesms-core/do/deploy_builds
	plugins/frontlinesms-core/do/release
	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/RequestParameter.groovy
	plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties
	plugins/radio/application.properties
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104

Conflicts:

	plugins/frontlinesms-core/application.properties
	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104

Conflicts:

	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy
	plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy
	plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy
	plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104

Conflicts:

	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy
	plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy