added a tab and changed tab names
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