Merge remote-tracking branch 'origin/master' into aleks_branch
add test method return json from map model
fix dependency for phantomjs; fix return type in method getCommentIsDeleted to boolean
some little retype & grammar fix
Merge remote-tracking branch 'origin/master' into aleks_branch