Merge pull request #17 from brain-murphy/elizabeth

Elizabeth
Merge pull request #18 from brain-murphy/elizabeth

fixed EditView to EditText
fix expiration time offset
Merge branch 'master' of https://github.com/brain-murphy/crowdsurf into elizabeth