Merge origin/master

Conflicts:
	src/lapr1/Principal.java
Merge origin/master