Initial commit
add build script
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	.gitignore
Add ci build script