commit before merge form master
merge master
get map working
Merge pull request #43 from teravest/forgot_password

Forgot password