Code cleanup
Code cleanup
Project update
Merge branch 'master' of https://github.com/nradulovic/meerkat

Conflicts:
	nbproject/Makefile-genesis.properties
Merge branch 'master' of https://github.com/nradulovic/meerkat