New build system and refactoring
Merge commit 'ac6bedc'

Conflicts:
	release.sh