Added uid/gid setting
Refactor configure.ac structure
Merge branch 'master' into dev

Conflicts:
	configure.ac