[nim, dj] Commiting so that we can move functional test to functional_tests repo
[nim, dj] Moving view poll functional test to functional_tests directory
[nim, dj] Moving view poll functional test to functional_tests directory
[nim, dj] Created PageObject model for pages to abstract browser interaction from the test cases
[nim, dj] Updated test to use PageObject models
[nim,dj] Resolving conflicts
[dj,nim] Merging conflicts on the Page object and Poll View test.
[nim, dj] adding __init__.py
[nim, dj] Merging master and origin/master
Merge remote-tracking branch 'origin/master'

Resolving branch divergence in submodule rapidsms_ureport
Merge remote-tracking branch 'origin/master'

Resolving conflicts
[dj, nim] Fixing functional tests so that they can be moved to the functional test folder.
[dj, nim] Adding the functional test to the new functional test folder.
Merge remote-tracking branch 'origin/master'
Merging divergence of master and arigin/master