before another merge
Merge branch 'master' of https://github.com/MrFlark/Battlefield-4

Conflicts:
	Server/src/network/Host.java
before merge