added LICENSE and NOTICE for switch from MIT to Apache2
conflict
Merge branch 'dev'
added tag
changed version
Merge pull request #147 from dotskapes/master

Merge