fixes
Merge branch 'master' of github.com:konradrodzik/AND2IOS

Conflicts:
	abutton.h
Merge branch 'master' of github.com:konradrodzik/AND2IOS