Changing master branch version to master

Conflicts:

	configure.ac