Merge pull request #36 from shaladi/master

fixed location bug. changed ipl -> data
Temporary commit so Shalom can do stuff
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable
moved gcm message to verify
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable
added user logging
Merge pull request #38 from shaladi/userlog

added user logging
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable
Fix email parsing on the server
Merge pull request #39 from ARmadillo-reuse/unstable

Fix email parsing
added * to allowed hosts
took out [claimed] from subject