Added Leaderboard Control/View
Merged Leaderboard with login, score activities
Merged leaderboard activity with login, score
Merge remote-tracking branch 'origin/master'

Conflicts:
	repotest/AndroidManifest.xml
	repotest/bin/AndroidManifest.xml
	repotest/bin/R.txt
	repotest/bin/classes/android/support/v7/appcompat/R$layout.class
	repotest/bin/classes/com/example/repotest/MainActivity$PlaceholderFragment.class
	repotest/bin/classes/com/example/repotest/MainActivity.class
	repotest/bin/classes/com/example/repotest/R$id.class
	repotest/bin/classes/com/example/repotest/R$integer.class
	repotest/bin/classes/com/example/repotest/R$layout.class
	repotest/bin/classes/com/example/repotest/R$menu.class
	repotest/bin/classes/com/example/repotest/R$string.class
	repotest/bin/classes/com/example/repotest/R$style.class
	repotest/bin/classes/com/example/repotest/R$styleable.class
	repotest/gen/android/support/v7/appcompat/R.java
	repotest/gen/com/example/repotest/R.java
	repotest/res/values/strings.xml
	repotest/res/values/styles.xml
	repotest/src/com/example/repotest/MainActivity.java