Merge master and development branches