Synchronized with main branch at other office. Started adding license information.