Change to all rights reserved.
Change back to gpl3
Merge branch 'master' into ember

* master:
  Change back to gpl3
  Change to all rights reserved.

Conflicts:
	LICENSE