Merge origin/master

Conflicts:
	src/projectogetplay/Principal.java