merged user authorization
Merge dev branch
updated license headers