Changed license to GPLv3
Added GPLv3 headers
Merge branch 'develop'