Merge pull request #3 from airokay/turok

Turok
Merge branch 'development' into charles
added Search MenuItem to RankingsActivity
implemented Search for RankingsActivity
Activities are no longer recreated when using the up button
added a few dimen values
tiny restyling of model_player layout
tiny restyling of PlayerActivity layout
RankingsActivity will now display a message if a network error occurs
Merge pull request #4 from airokay/turok

Tournaments List Finished
Merge branch 'development' into charles

Conflicts:

smash-ranks-android/app/src/main/java/com/garpr/android/activities/Ranki
ngsActivity.java
	smash-ranks-android/app/src/main/res/values/strings.xml
Merge pull request #5 from airokay/charles

search functionality
empty commit

something wrong ith my git hub