added call to keyword validation in activity validation
Trash restore failure will now result in correct flash message
corrected bug in trashservice
Added restore activity that has colliding keyword test
Added test in AutoreplyControllerISpec
fixed test : restoring a deleted activity should fail if an activity with colliding keywords exists
Update plugins/frontlinesms-core/web-app/help/core/activities/1.getting_around_activities.txt
Update plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt
Update plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt
Update plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt
Created do/deploy_webapp script in install.
Merge branch 'refs/heads/CORE-1832' into core-2.x
Merge branch 'core-2.x' into test-ui