entity class
removed metada folder from codelite
changes to makefile
Merge branch 'master' of github.com:mnemyx/8170-1

Conflicts:
	.gitignore~

	deleted:    .gitignore~
	deleted:    README.md~