Fixed Copyright notice again
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/com/github/timedev/quar/ClientProxy.java
	common/com/github/timedev/quar/QuarMod.java
	common/com/github/timedev/quar/block/BlockQuar.java
	common/com/github/timedev/quar/block/BlockQuariumOre.java
	common/com/github/timedev/quar/inventory/TileEntityQuar.java
Fixed Copyright notice one (probably not) final time