update
Merge branch 'master' of github.com:mouda/Steven

Conflicts:
	configure