Modified control panel to show the user's information
Merge branch 'dev' of https://github.com/lalezaris/Android-Sample into dev

Conflicts:
	FragmentTest/src/edu/wpi/cs/loginactivity/LoginControllerActivity.java