wip
wip
wip
wip
Merge branch 'next' of https://github.com/akulyakhtin/psy-tests into proguard

Conflicts:
	project.properties