Stage

merge /master/services folder to /stage branch