[ADD] Change current version
Merge branch 'master' into weblog

Conflicts:
	Makefile