Added elements to ListView
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/unitapp/MainActivity.class
	res/layout/activity_main.xml