Merge origin/master into dev

Conflicts:
	test/com/example/tests/register.java
Merge origin/master into dev

Conflicts:
	test/com/example/tests/register.java
Merge origin/master

Conflicts:
	test/com/example/tests/register.java