circle display page (lucia) 12/7
Merge remote-tracking branch 'origin/master'

Conflicts:

	ParseStarterProject/bin/classes/com/parse/starter/CircleDisplayActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/MainActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/WelcomeActivity.class
	ParseStarterProject/src/com/parse/starter/CircleDisplayActivity.java
	ParseStarterProject/src/com/parse/starter/MainActivity.java