pokk
Merge branch 'master' of
https://github.com/butelo/conto-app-framework.git

Conflicts:
	project.properties
oiho