Added sliding page tabs and material design stuff
Merge branch 'master' of https://github.com/OneSoundApp/OneSound

Conflicts:
	app/app.iml