comment out console
adding licensing info
Merge branch 'develop'
cleaning up
Merge branch 'develop'