Added FIXMEs and TODOs; removed unnecessary `transactional=true` from service.
Add magic wand functionality to custom activity wizard
Refactored custom activity JS to make collecting forms data simpler.
Removed alert from JS.
Set styling for magic wand in custom activity wizard

Conflicts:

	plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp
Add messageComposer to taglib
Use messageComposer in custom activity wizard.
Fix positioning of controls in the message composer
Add autosize plugin and message_composer javascript library to resources.
Remove inline JS from reply step gsp

Conflicts:

	plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp
fixed saving of stepProperties in CustomActivityService
Add character counter to message composer component
Auto fill message composer in custom activity editing mode
Fix selector for message composer textarea in custom activity wizard
Update character count for message composers in newly launched custom activity wizard in editing mode
fixed PollISpec and MessageControllerISpec

Conflicts:

	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy
	plugins/frontlinesms-core/grails-app/domain/frontlinesms2/PollResponse.groovy
	plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy
fixed CustomactivityControllerISpec
fixed? PollSpec