Resolve #65, #60: move client bundle building to separated and independe...

#65 #60