fix Map null pointer exception
Merge branch 'master' of https://github.com/scobb/Impromptu
Merge branch 'master' of https://github.com/scobb/Impromptu
started fixing profile
Merge branch 'master' of https://github.com/scobb/Impromptu
working on profile