Nista bitno
Merge branch 'master' of https://github.com/ib2013/androidapp

Conflicts:
	bin/classes/com/example/helloworld/R$layout.class
	bin/classes/com/example/helloworld/R$menu.class
	bin/classes/com/example/helloworld/R$string.class
	bin/classes/com/example/helloworld/R$style.class
	bin/resources.ap_