using buildout 2.x
update makefile
update makefile
Merge branch 'master' into develop

Conflicts:
	Makefile
Merge branch 'master' into develop