Merge branch 'develop'
added MIT license file
Added License comments to source code files
resolved conflicts when merging master into develop