Removed some new line at the end of the file
Fixed versions for maven
Fixed link for CustomActivity.java
Merge branch 'develop' into play_store

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.