added license
added license
Merge branch 'master' into beta
removed BASE64 encoding of properties
Merge branch 'alpha' into beta