Merge origin/master

Conflicts:
	src/java/renders/entities/bill.java
Merge origin/master

Conflicts:
	src/java/renders/entities/bill.java