UserMaps feat2
Merge branch 'master' into usersandmaps
changes
Merge pull request #20 from fox-squirrels-2013/usersandmaps

Usersandmaps