Updated display
Merge remote-tracking branch 'origin/master'

Conflicts:
	Candar/src/src/interns/candar/MainActivity.java