Add Tab
Add tab view with the 3 different tabs and layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	gradle/wrapper/gradle-wrapper.properties