Added action bar and a viewpager to the application
Merge branch 'master' of https://github.com/ikinz/CSGOGrenades

Conflicts:
	.idea/workspace.xml
Updated