Merge pull request #378 from iameric1986/master

Fixed merge conflicts
Removed GeoLocation from comments
Merge pull request #379 from pachalad/master

Removed GeoLocation from comments
Added javadocs
fixed merge conflict
EWWEMEL
Merge pull request #381 from pachalad/master

EWWEMEL
Merge pull request #380 from cchan5/master

Added javadocs
Fixing merge conflict
Fixing merge conflict

Merge remote-tracking branch 'upstream/master'