1. Minor change on map creating method in user model
2. Adding map function finished.
Merge remote-tracking branch 'Minerva/master'
1. Minor change on map creating method in user model
2. Adding map function finished.
3. Resolve confilicts