Merge origin/master

Conflicts:
	LICENSE
Committing development branch stuff