Merge branch 'master' of https://github.com/nyi/happen-android

Conflicts:
	app/src/main/java/com/happen/app/MainActivity.java
	app/src/main/res/values/strings.xml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'happenhub/master' have diverged,
# and have 1 and 2 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed butyou are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	new file:   .idea/libraries/support_v13_19_0_1.xml
#	new file:   .idea/libraries/support_v4_19_0_1.xml
#	modified:   app/app.iml
#	modified:   app/src/main/java/com/happen/app/MainActivity.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	app/src/main/java/com/happen/app/MainActivity.java.orig
#	app/src/main/res/values/strings.xml.orig