modified makefile
pam wrokaround
version
Merge branch 'master' into java7

* master:
  version
  pam wrokaround
  modified makefile

Conflicts:
	Makefile